compilation fix for wxGTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index d49e549ca34056b62ac60434e7a455c4ccdb8b5b..b61ca8bac302bcf7d442d0d715d2a644d47474d4 100644 (file)
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -89,7 +89,9 @@ public:
 
 #if defined(__WXMSW__)
     #include "wx/msw/apptbase.h"
-#else
+#elif defined(__UNIX__)
+    #include "wx/unix/apptbase.h"
+#else // no platform-specific methods to add to wxAppTraits
     typedef 
     // wxAppTraits must be a class because it was forward declared as class
     class WXDLLEXPORT wxAppTraits : public wxAppTraitsBase

diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index 30b96497c1122863374e026cc8f9e909ae690b67..13b25fcbc695451637d97b880a9cbb0933d58df9 100644 (file)
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -19,7 +19,7 @@
 class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
-    virtual bool CreateEndProcessPipe();
+    virtual bool CreateEndProcessPipe(wxExecuteData& execData);
     virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd);
     virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
     virtual int WaitForChild(wxExecuteData& execData);

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 2652222813a3b2965624d1d8abf63e077a9f58e6..b17928422393ea1621d49ed2064a63a06943f57c 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -32,6 +32,7 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/list.h"
+    #include "wx/log.h"
     #include "wx/msgdlg.h"
 #endif
 

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 2baffdcf32d7161177ea6e967c976726f96ffdc1..aa06d2208bda3f3e4d55eb2771cf3bb9141aefec 100755 (executable)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -121,7 +121,8 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
         #endif
     }
 #else // !MSW, !Mac
-    wxFputs(out, stderr);
+    // FIXME: why is wxFputs() not defined under Linux?
+    fputs(out.mb_str(), stderr);
     fflush(stderr);
 #endif // platform
 }

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 7371b1ffbf22384217c2e5bd0162fddd4442b8fd..fc89d353ac5522212fe1e06cf136c046f31215fa 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -32,6 +32,7 @@
 #if wxUSE_TIMER
 
 #ifndef WX_PRECOMP
+    #include "wx/timer.h"
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 006a066446cd62ea034d4ff24bdd646bad2ca3a2..a7b0428703c90edab79b8ac3a52a40e409df7f98 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -76,9 +76,6 @@
 // global data
 //-----------------------------------------------------------------------------
 
-wxApp *wxTheApp = (wxApp *)  NULL;
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-
 bool   g_mainThreadLocked = FALSE;
 gint   g_pendingTag = 0;
 

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 4ed43ea7fc17a4bcc6497c438fc59721424e2409..75972bb8b603e4fe63e9c10ac1b120ad6c34ac7a 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -10,6 +10,7 @@
 #include "wx/utils.h"
 #include "wx/string.h"
 
+#include "wx/apptrait.h"
 #include "wx/intl.h"
 #include "wx/log.h"
 
@@ -121,12 +122,14 @@ int wxDisplayDepth()
     return gdk_window_get_visual( wxGetRootWindow()->window )->depth;
 }
 
-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
 {
-  if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
-  if (minorVsn) *minorVsn = GTK_MINOR_VERSION;
+    if (majorVsn)
+        *majorVsn = GTK_MAJOR_VERSION;
+    if (minorVsn)
+        *minorVsn = GTK_MINOR_VERSION;
 
-  return wxGTK;
+    return wxGTK;
 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 006a066446cd62ea034d4ff24bdd646bad2ca3a2..a7b0428703c90edab79b8ac3a52a40e409df7f98 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -76,9 +76,6 @@
 // global data
 //-----------------------------------------------------------------------------
 
-wxApp *wxTheApp = (wxApp *)  NULL;
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-
 bool   g_mainThreadLocked = FALSE;
 gint   g_pendingTag = 0;
 

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index 4ed43ea7fc17a4bcc6497c438fc59721424e2409..75972bb8b603e4fe63e9c10ac1b120ad6c34ac7a 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -10,6 +10,7 @@
 #include "wx/utils.h"
 #include "wx/string.h"
 
+#include "wx/apptrait.h"
 #include "wx/intl.h"
 #include "wx/log.h"
 
@@ -121,12 +122,14 @@ int wxDisplayDepth()
     return gdk_window_get_visual( wxGetRootWindow()->window )->depth;
 }
 
-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
 {
-  if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
-  if (minorVsn) *minorVsn = GTK_MINOR_VERSION;
+    if (majorVsn)
+        *majorVsn = GTK_MAJOR_VERSION;
+    if (minorVsn)
+        *minorVsn = GTK_MINOR_VERSION;
 
-  return wxGTK;
+    return wxGTK;
 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index f6d60dcf320a3fa8c5fc1c64b67d6e218f54ef96..2f15a8cb268c60c4a02a9b3272f776330c1ccc83 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -21,6 +21,7 @@
 #include "wx/intl.h"
 #include "wx/log.h"
 #include "wx/app.h"
+#include "wx/apptrait.h"
 
 #include "wx/utils.h"
 #include "wx/process.h"
@@ -1079,7 +1080,7 @@ bool wxGUIAppTraits::CreateEndProcessPipe(wxExecuteData& execData)
 
 bool wxGUIAppTraits::IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd)
 {
-    return fd == execData.pipeEndProcDetect[wxPipe::Write]
+    return fd == (execData.pipeEndProcDetect)[wxPipe::Write];
 }
 
 void wxGUIAppTraits::DetachWriteFDOfEndProcessPipe(wxExecuteData& execData)