look for libs under /usr/lib64 and /usr/X11R6/lib64 (needed for some Linux distributi...

[wxWidgets.git] / src / unix / baseunix.cpp

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index e6250a0c130a78042e183986abf86fe3ecf33d3d..bd40653d6fcbabe041e58e39ce64578d59c71f33 100644 (file)
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -25,9 +25,13 @@
 #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/utils.h"
+#include "wx/unix/execute.h"

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


@@ -81,28 +85,29 @@ wxConsoleAppTraits::WaitForChild(wxExecuteData& execData)
 // misc other stuff
 // ----------------------------------------------------------------------------
 
 // misc other stuff
 // ----------------------------------------------------------------------------
 

-// WXWIN_OS_DESCRIPTION is normally defined by configure
-#if defined( __MWERKS__ ) && defined(__MACH__)
-    #define WXWIN_OS_DESCRIPTION "MacOS X"
-#endif
+// this is in mac/utils.cpp under Mac
+#ifndef __WXMAC__

 
 

-int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
+wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()

 {
 {

+    static wxToolkitInfo info;

     int major, minor;
     char name[256];
 
     int major, minor;
     char name[256];
 

-    if ( sscanf(WXWIN_OS_DESCRIPTION, "%s %d.%d", name, &major, &minor) != 3 )
+    if ( sscanf(WXWIN_OS_DESCRIPTION, "%255s %d.%d", name, &major, &minor) != 3 )

     {
         // unreckognized uname string format
         major =
         minor = -1;
     }
 
     {
         // unreckognized uname string format
         major =
         minor = -1;
     }
 

-    if ( majorVsn )
-        *majorVsn = major;
-    if ( minorVsn )
-        *minorVsn = minor;
+    info.versionMajor = major;
+    info.versionMinor = minor;
+    info.name = _T("wxBase");
+    info.os = wxUNIX;

 
 

-    return wxUNIX;
+    return info;

 }
 
 }
 

+#endif // __WXMAC__
+