make it possible to restart timer with a simple Start(), as in other ports

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

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index 99a1bdcd3e8865ce636a921e5c60021ecbe41da6..bd40653d6fcbabe041e58e39ce64578d59c71f33 100644 (file)
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -85,13 +85,12 @@ wxConsoleAppTraits::WaitForChild(wxExecuteData& execData)
 // 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];
 
@@ -102,11 +101,13 @@ int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
         minor = -1;
     }
 
-    if ( verMaj )
-        *verMaj = major;
-    if ( verMin )
-        *verMin = minor;
+    info.versionMajor = major;
+    info.versionMinor = minor;
+    info.name = _T("wxBase");
+    info.os = wxUNIX;
 
-    return wxUNIX;
+    return info;
 }
 
+#endif // __WXMAC__
+