compilation fixes

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 1d63e99672175f5755b08306a6d29c448ea47380..2ca933042f7567e759925bdfcc86038147d3eba2 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -25,6 +25,8 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/app.h"
+    #include "wx/intl.h"

     #if wxUSE_LOG
         #include "wx/log.h"
     #endif // wxUSE_LOG
     #if wxUSE_LOG
         #include "wx/log.h"
     #endif // wxUSE_LOG


@@ -470,10 +472,12 @@ wxFontMapper *wxConsoleAppTraitsBase::CreateFontMapper()
 
 #endif // wxUSE_FONTMAP
 
 
 #endif // wxUSE_FONTMAP
 

+#ifdef __WXDEBUG__

 bool wxConsoleAppTraitsBase::ShowAssertDialog(const wxString& msg)
 {
     return wxAppTraitsBase::ShowAssertDialog(msg);
 }
 bool wxConsoleAppTraitsBase::ShowAssertDialog(const wxString& msg)
 {
     return wxAppTraitsBase::ShowAssertDialog(msg);
 }

+#endif

 
 bool wxConsoleAppTraitsBase::HasStderr()
 {
 
 bool wxConsoleAppTraitsBase::HasStderr()
 {

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index d22e49184c6cb8352e0b874521bde92e53507008..21cd1616796a37d5bf854bd05e9b365f000718c5 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -29,6 +29,8 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif //WX_PRECOMP
 
 #include "wx/timer.h"
 #endif //WX_PRECOMP
 
 #include "wx/timer.h"

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index e6250a0c130a78042e183986abf86fe3ecf33d3d..ef7f1e1f9d20fd5362ec17e57ee93a601b9b92b6 100644 (file)
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -25,9 +25,12 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/log.h"
+    #include "wx/intl.h"

 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"

+#include "wx/unix/execute.h"

 
 // for waitpid()
 #include <sys/types.h>
 
 // for waitpid()
 #include <sys/types.h>


@@ -98,10 +101,10 @@ int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
         minor = -1;
     }
 
         minor = -1;
     }
 

-    if ( majorVsn )
-        *majorVsn = major;
-    if ( minorVsn )
-        *minorVsn = minor;
+    if ( verMaj )
+        *verMaj = major;
+    if ( verMin )
+        *verMin = minor;

 
     return wxUNIX;
 }
 
     return wxUNIX;
 }