SVN Commit by andreas: r4162 - in trunk/pgadmin3: il8n src src/base src/include - Mailing list pgadmin-hackers

Author: andreas
Date: 2005-05-08 19:38:28 +0100 (Sun, 08 May 2005)
New Revision: 4162

Modified:
   trunk/pgadmin3/il8n/Makefile.am
   trunk/pgadmin3/src/Makefile.am
   trunk/pgadmin3/src/base/appbase.cpp
   trunk/pgadmin3/src/base/pgConnBase.cpp
   trunk/pgadmin3/src/include/pgAdmin3.h
   trunk/pgadmin3/src/include/sysLogger.h
Log:
gcc fixes

Modified: trunk/pgadmin3/il8n/Makefile.am
===================================================================
--- trunk/pgadmin3/il8n/Makefile.am    2005-05-08 17:41:41 UTC (rev 4161)
+++ trunk/pgadmin3/il8n/Makefile.am    2005-05-08 18:38:28 UTC (rev 4162)
@@ -44,6 +44,7 @@
 TMP_ui = \
 $(srcdir)/wxstd.mo \
 $(srcdir)/pgadmin3.lng \
+$(srcdir)/pg_settings.csv
 $(srcdir)/af_ZA/pgadmin3.mo \
 $(srcdir)/ar_SA/pgadmin3.mo \
 $(srcdir)/ca_ES/pgadmin3.mo \

Modified: trunk/pgadmin3/src/Makefile.am
===================================================================
--- trunk/pgadmin3/src/Makefile.am    2005-05-08 17:41:41 UTC (rev 4161)
+++ trunk/pgadmin3/src/Makefile.am    2005-05-08 18:38:28 UTC (rev 4162)
@@ -13,8 +13,8 @@
 pgadmin3_SOURCES = \
 $(srcdir)/pgAdmin3.cpp \
 \
-$(srcdir)/base/base.cpp $(srcdir)/base/appBase.cpp $(srcdir)/base/sysLogger.cpp \
-$(srcdir)/base/pgConnBase.cpp $(srcdir)/base/pgSetBase.cpp \
+$(srcdir)/base/base.cpp $(srcdir)/base/appbase.cpp $(srcdir)/base/sysLogger.cpp \
+$(srcdir)/base/pgConnBase.cpp $(srcdir)/base/pgSetBase.cpp \
 \
 $(srcdir)/main/dlgClasses.cpp $(srcdir)/main/events.cpp \
 \
@@ -64,7 +64,7 @@
 $(srcdir)/dlg/dlgSequence.cpp $(srcdir)/dlg/dlgTrigger.cpp $(srcdir)/dlg/dlgType.cpp \
 $(srcdir)/dlg/dlgCheck.cpp \
 \
-$(srcdir)/utils/sysLogger.cpp $(srcdir)/utils/sysSettings.cpp $(srcdir)/utils/sysProcess.cpp \
+$(srcdir)/utils/sysSettings.cpp $(srcdir)/utils/sysProcess.cpp \
 utils/misc.cpp $(srcdir)/utils/utffile.cpp $(srcdir)/utils/pgconfig.cpp $(srcdir)/utils/update.cpp \
 \
 $(srcdir)/slony/slObject.cpp $(srcdir)/slony/slCluster.cpp $(srcdir)/slony/slNode.cpp \
@@ -77,7 +77,7 @@
 $(srcdir)/ui/common/xrcDialogs.cpp

 noinst_HEADERS = \
-$(srcdir)/include/base/base.h $(srcdir)/include/base/appbase.h $(srcdir)/include/base/syslogger.h \
+$(srcdir)/include/base/base.h $(srcdir)/include/base/appbase.h $(srcdir)/include/base/sysLogger.h \
 $(srcdir)/include/base/pgDefs.h $(srcdir)/include/base/pgConnBase.h $(srcdir)/include/base/pgSetBase.h \
 $(srcdir)/include/copyright.h $(srcdir)/include/version.h $(srcdir)/include/ctlSQLBox.h \
 $(srcdir)/include/ctlSQLResult.h $(srcdir)/include/ctlListView.h \
@@ -142,8 +142,7 @@
 $(srcdir)/include/images/pgAdmin3.ico

 TMP_ui = \
-$(srcdir)/ui/common/*.xrc \
-$(srcdir)/ui/pg_settings.csv
+$(srcdir)/ui/common/*.xrc

 if !APPBUNDLE


Modified: trunk/pgadmin3/src/base/appbase.cpp
===================================================================
--- trunk/pgadmin3/src/base/appbase.cpp    2005-05-08 17:41:41 UTC (rev 4161)
+++ trunk/pgadmin3/src/base/appbase.cpp    2005-05-08 18:38:28 UTC (rev 4162)
@@ -77,30 +77,50 @@
         path.Add(dataDir + SCRIPT_DIR) ;

 #else // other *ixes
-    dataDir = DATA_DIR;
+
+// Data path (defined by configure under Unix).
+#ifndef DATA_DIR
+#define DATA_DIR "./"
 #endif

+    dataDir = wxString::FromAscii(DATA_DIR);
+#endif

+
     if (dataDir)
     {
         if (wxDir::Exists(dataDir + I18N_DIR))
             i18nPath = dataDir + I18N_DIR;

         if (wxDir::Exists(dataDir + UI_DIR))
-          uiPath = dataDir + UI_DIR;
+            uiPath = dataDir + UI_DIR;

         if (wxDir::Exists(dataDir + DOC_DIR))
-          docPath = dataDir + DOC_DIR ;
+            docPath = dataDir + DOC_DIR ;
     }

     if (i18nPath.IsEmpty())
-        i18nPath = loadPath + I18N_DIR;
-
+    {
+        if (wxDir::Exists(loadPath + I18N_DIR))
+            i18nPath = loadPath + I18N_DIR;
+        else
+            i18nPath = loadPath + wxT("/..") I18N_DIR;
+    }
     if (uiPath.IsEmpty())
-        uiPath = loadPath + UI_DIR))
+    {
+        if (wxDir::Exists(loadPath + UI_DIR))
+            uiPath = loadPath + UI_DIR;
+        else
+            uiPath = loadPath + wxT("/..") UI_DIR;
+    }

     if (docPath.IsEmpty())
-        docPath = loadPath + wxT("/..") DOC_DIR ;
+    {
+        if (wxDir::Exists(loadPath + DOC_DIR))
+            docPath = loadPath + DOC_DIR ;
+        else
+            docPath = loadPath + wxT("/..") DOC_DIR ;
+    }
 #endif
 }

@@ -149,7 +169,7 @@
 {
     // Startup the windows sockets if required
 #ifdef __WXMSW__
-    WSADATA    wsaData;
+    WSADATA    wsaData;
     if (WSAStartup(MAKEWORD(1, 1), &wsaData) != 0) {
         wxLogFatalError(__("Cannot initialise the networking subsystem!"));
     }
@@ -163,7 +183,7 @@
 int pgAppBase::OnExit()
 {
 #ifdef __WXMSW__
-    WSACleanup();
+    WSACleanup();
 #endif

     return 1;

Modified: trunk/pgadmin3/src/base/pgConnBase.cpp
===================================================================
--- trunk/pgadmin3/src/base/pgConnBase.cpp    2005-05-08 17:41:41 UTC (rev 4161)
+++ trunk/pgadmin3/src/base/pgConnBase.cpp    2005-05-08 18:38:28 UTC (rev 4162)
@@ -33,7 +33,7 @@
 // App headers
 #include "base/pgConnBase.h"
 #include "base/base.h"
-#include "sysLogger.h"
+#include "base/sysLogger.h"


 double pgConnBase::libpqVersion=8.0;

Modified: trunk/pgadmin3/src/include/pgAdmin3.h
===================================================================
--- trunk/pgadmin3/src/include/pgAdmin3.h    2005-05-08 17:41:41 UTC (rev 4161)
+++ trunk/pgadmin3/src/include/pgAdmin3.h    2005-05-08 18:38:28 UTC (rev 4162)
@@ -25,20 +25,12 @@
 // App headers
 #include "sysSettings.h"

-// XRC Path
 #ifdef __WXMSW__
-#define XRC_PATH wxT("/ui/win32")
 #else
 #include "config.h"
 #undef VERSION
-#define XRC_PATH wxT("/ui/gtk")
 #endif

-// Data path (defined by configure under Unix).
-#ifndef DATA_DIR
-#define DATA_DIR wxT("./")
-#endif
-
 const float SERVER_MIN_VERSION = 7.3f;

 #ifdef __WIN32__

Modified: trunk/pgadmin3/src/include/sysLogger.h
===================================================================
--- trunk/pgadmin3/src/include/sysLogger.h    2005-05-08 17:41:41 UTC (rev 4161)
+++ trunk/pgadmin3/src/include/sysLogger.h    2005-05-08 18:38:28 UTC (rev 4162)
@@ -9,5 +9,5 @@
 //
 //////////////////////////////////////////////////////////////////////////

-#include "base/syslogger.h"
+#include "base/sysLogger.h"