Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.203
retrieving revision 1.204
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.203 -r1.204
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,6 +17,8 @@
 </ul>
 <br>
 <ul>
+    <li>2005-04-18 AP        Unix Domain Socket additional stuff
+    <li>2005-04-18 AP        switch to wxWidgets 2.6
     <li>2005-04-15 DP        Unix Domain Socket support as inspired by Dominique Quatravaux
     <li>2005-04-07 AP        VACUUM hint
     <li>2005-04-04 AP        Control dependent win32 services
--- /dev/null
+++ src/wx-pgadmin.dsw
@@ -0,0 +1,197 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "adv"=".\wx_adv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "base"=".\wx_base.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "core"=".\wx_core.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "html"=".\wx_html.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "net"=".\wx_net.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "ogl"="..\..\contrib\build\ogl\ogl.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "stc"="..\..\contrib\build\stc\stc.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxexpat"=".\wx_wxexpat.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxjpeg"=".\wx_wxjpeg.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxpng"=".\wx_wxpng.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxregex"=".\wx_wxregex.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxtiff"=".\wx_wxtiff.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxzlib"=".\wx_wxzlib.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "xml"=".\wx_xml.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "xrc"=".\wx_xrc.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
Index: pgAdmin3.dsp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.dsp,v
retrieving revision 1.126
retrieving revision 1.127
diff -Lsrc/pgAdmin3.dsp -Lsrc/pgAdmin3.dsp -u -w -r1.126 -r1.127
--- src/pgAdmin3.dsp
+++ src/pgAdmin3.dsp
@@ -43,19 +43,19 @@
 # PROP Intermediate_Dir "Unicode_SSL_Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include/" /I "c:/wxWidgets-2.5.4/include" /I "c:/wxWidgets-2.5.4/contrib/include" /I "c:/wxWidgets-2.5.4/lib/mswd" /I "c:/postgresql/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /FAcs /FR /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include/" /I "c:/wxWidgets-2.6/include" /I "c:/wxWidgets-2.6/contrib/include" /I "c:/wxWidgets-2.6/lib/mswd" /I "c:/postgresql/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /FAcs /FR /FD /c
 # SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWidgets-2.5.4/include" /I "c:/wxWidgets-2.5.4/contrib/include" /I "c:/program files/postgresql/8.0/include" /I "include/" /I "agent/include" /I "slony/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D "SSL" /FAcs /Fr /Yu"pgadmin3.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWidgets-2.6/include" /I "c:/wxWidgets-2.6/contrib/include" /I "c:/program files/postgresql/8.0/include" /I "include/" /I "agent/include" /I "slony/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D "SSL" /FAcs /Fr /Yu"pgadmin3.h" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /i "c:/wxWidgets-2.5.4/include" /i "c:/wxWidgets-2.5.4/contrib/include" /d "_DEBUG"
-# ADD RSC /l 0x809 /i "c:/wxWidgets-2.5.4/include" /d "_DEBUG"
+# ADD BASE RSC /l 0x809 /i "c:/wxWidgets-2.6/include" /i "c:/wxWidgets-2.6/contrib/include" /d "_DEBUG"
+# ADD RSC /l 0x809 /i "c:/wxWidgets-2.6/include" /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswud.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib stcd.lib libpq.lib wxxrcd.lib regexd.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"c:/wxWidgets-2.5.4/lib" /libpath:"c:/wxWidgets-2.5.4/contrib/lib" /libpath:"c:/postgresql/lib"
-# ADD LINK32 libpq.lib wxbase25ud.lib wxbase25ud_xml.lib wxbase25ud_net.lib wxmsw25ud_adv.lib wxmsw25ud_core.lib wxmsw25ud_html.lib wxregexud.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw25ud_stc.lib wxmsw25ud_ogl.lib wxmsw25ud_xrc.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"c:/wxWidgets-2.5.4/lib/vc_lib" /libpath:"c:/program files/postgresql/8.0/lib/ms"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswud.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib stcd.lib libpq.lib wxxrcd.lib regexd.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"c:/wxWidgets-2.6/lib" /libpath:"c:/wxWidgets-2.6/contrib/lib" /libpath:"c:/postgresql/lib"
+# ADD LINK32 libpq.lib wxbase26ud.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxregexud.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw26ud_stc.lib wxmsw26ud_ogl.lib wxmsw26ud_xrc.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"c:/wxWidgets-2.6/lib/vc_lib" /libpath:"c:/program files/postgresql/8.0/lib/ms"
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "pgAdmin3 - Win32 Unicode SSL Release"
@@ -72,19 +72,19 @@
 # PROP Intermediate_Dir "Unicode_SSL_Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "include/" /I "c:/wxWidgets-2.5.4/include" /I "c:/wxWidgets-2.5.4/contrib/include" /I "c:/wxWidgets-2.5.4/lib/mswd" /I "c:/postgresql/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D "EMBED_XRC" /FAcs /FR /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "c:/wxWidgets-2.5.4/include" /I "c:/wxWidgets-2.5.4/contrib/include" /I "c:/program files/postgresql/8.0/include" /I "include/" /I "agent/include" /I "slony/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D "EMBED_XRC" /D "SSL" /FAcs /FR /Yu"pgadmin3.h" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "include/" /I "c:/wxWidgets-2.6/include" /I "c:/wxWidgets-2.6/contrib/include" /I "c:/wxWidgets-2.6/lib/mswd" /I "c:/postgresql/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D "EMBED_XRC" /FAcs /FR /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "c:/wxWidgets-2.6/include" /I "c:/wxWidgets-2.6/contrib/include" /I "c:/program files/postgresql/8.0/include" /I "include/" /I "agent/include" /I "slony/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D "EMBED_XRC" /D "SSL" /FAcs /FR /Yu"pgadmin3.h" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /i "c:/wxWidgets-2.5.4/include" /i "c:/wxWidgets-2.5.4/contrib/include" /d "NDEBUG"
-# ADD RSC /l 0x809 /i "c:/wxWidgets-2.5.4/include" /d "NDEBUG"
+# ADD BASE RSC /l 0x809 /i "c:/wxWidgets-2.6/include" /i "c:/wxWidgets-2.6/contrib/include" /d "NDEBUG"
+# ADD RSC /l 0x809 /i "c:/wxWidgets-2.6/include" /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswu.lib png.lib zlib.lib jpeg.lib tiff.lib stc.lib libpq.lib wxxrc.lib regex.lib /nologo /subsystem:windows /map /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept /libpath:"c:/wxWidgets-2.5.4/lib" /libpath:"c:/wxWidgets-2.5.4/contrib/lib" /libpath:"c:/postgresql/lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswu.lib png.lib zlib.lib jpeg.lib tiff.lib stc.lib libpq.lib wxxrc.lib regex.lib /nologo /subsystem:windows /map /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept /libpath:"c:/wxWidgets-2.6/lib" /libpath:"c:/wxWidgets-2.6/contrib/lib" /libpath:"c:/postgresql/lib"
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 libpq.lib wxbase25u.lib wxbase25u_xml.lib wxbase25u_net.lib wxmsw25u_adv.lib wxmsw25u_core.lib wxmsw25u_html.lib wxregexu.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib wxmsw25u_stc.lib wxmsw25u_ogl.lib wxmsw25u_xrc.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo /subsystem:windows /map /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept /libpath:"c:/wxWidgets-2.5.4/lib/vc_lib" /libpath:"c:/program files/postgresql/8.0/lib/ms"
+# ADD LINK32 libpq.lib wxbase26u.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_core.lib wxmsw26u_html.lib wxregexu.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib wxmsw26u_stc.lib wxmsw26u_ogl.lib wxmsw26u_xrc.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo /subsystem:windows /map /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept /libpath:"c:/wxWidgets-2.6/lib/vc_lib" /libpath:"c:/program files/postgresql/8.0/lib/ms"
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
Index: pgServer.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgServer.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -Lsrc/schema/pgServer.cpp -Lsrc/schema/pgServer.cpp -u -w -r1.61 -r1.62
--- src/schema/pgServer.cpp
+++ src/schema/pgServer.cpp
@@ -479,9 +479,10 @@
 
 wxString pgServer::GetIdentifier() const
 {
-    wxString id;
-    id.Printf(wxT("%s:%d"), GetName().c_str(), port);
-    return wxString(id);
+    if (GetName().IsEmpty() || GetName().StartsWith(wxT("/")))
+        return wxT("local:") + GetName();
+
+    return wxString::Format(wxT("%s:%d"), GetName().c_str(), port);
 }
 
 
@@ -611,12 +612,13 @@
 
         // Display the Server properties
 
-        properties->AppendItem(_("Hostname"), GetName());
         properties->AppendItem(_("Description"), GetDescription());
+        if (GetName().IsEmpty() || GetName().StartsWith(wxT("/")))
+            properties->AppendItem(_("Hostname"), wxT("local:") + GetName());
+        else
+        {
+            properties->AppendItem(_("Hostname"), GetName());
         properties->AppendItem(_("Port"), (long)GetPort());
-        if (!serviceId.IsEmpty())
-            properties->AppendItem(_("Service"), serviceId);
-
 #ifdef SSL
         if (GetConnected())
         {
@@ -639,6 +641,10 @@
             }
         }
 #endif
+        }
+        if (!serviceId.IsEmpty())
+            properties->AppendItem(_("Service"), serviceId);
+
         properties->AppendItem(_("Initial database"), GetDatabaseName());
         properties->AppendItem(_("Username"), GetUsername());
         properties->AppendItem(_("Need password?"), GetNeedPwd());
Index: dlgServer.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgServer.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lsrc/ui/dlgServer.cpp -Lsrc/ui/dlgServer.cpp -u -w -r1.17 -r1.18
--- src/ui/dlgServer.cpp
+++ src/ui/dlgServer.cpp
@@ -61,6 +61,7 @@
 
     cbDatabase->Append(settings->GetLastDatabase());
     cbDatabase->SetSelection(0);
+    if (settings->GetLastPort())
     txtPort->SetValue(NumToStr((long)settings->GetLastPort()));    
     cbSSL->SetSelection(settings->GetLastSSL());
     txtUsername->SetValue(settings->GetLastUsername());
@@ -166,6 +167,7 @@
         cbDatabase->Append(server->GetDatabaseName());
         txtDescription->SetValue(server->GetDescription());
         txtService->SetValue(server->GetServiceID());
+        if (server->GetPort())
         txtPort->SetValue(NumToStr((long)server->GetPort()));
         cbSSL->SetSelection(server->GetSSL());
         cbDatabase->SetValue(server->GetDatabaseName());
@@ -240,11 +242,18 @@
                || chkNeedPwd->GetValue() != server->GetNeedPwd();
     }
 
-#ifdef __WXMSW__
-    CheckValid(enable, !name.IsEmpty(), _("Please specify address."));
-#endif
     CheckValid(enable, !txtDescription->GetValue().IsEmpty(), _("Please specify description."));
+
+#ifdef __xxxWXMSW__
+    CheckValid(enable, !name.IsEmpty(), _("Please specify address."));
+    CheckValid(enable, StrToLong(txtPort->GetValue()) > 0, _("Please specify port."));
+#else
+    bool isPipe = (name.IsEmpty() || name.StartsWith(wxT("/")));
+    txtPort->Enable(!isPipe);
+    cbSSL->Enable(!isPipe);
+    if (!isPipe)
     CheckValid(enable, StrToLong(txtPort->GetValue()) > 0, _("Please specify port."));
+#endif
     CheckValid(enable, !txtUsername->GetValue().IsEmpty(), _("Please specify user name"));
 
     EnableOK(enable);