Commited Bryan Petty's blind fix patch.

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

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index b265339a06d00621b0ceea033b37d4e9b15fd36c..8f6345561842c4804830d96d3bb246925006158b 100644 (file)
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        unix/baseunix.cpp
+// Name:        src/unix/baseunix.cpp

 // Purpose:     misc stuff only used in console applications under Unix
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.06.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Purpose:     misc stuff only used in console applications under Unix
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.06.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWindows license
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -27,10 +27,10 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/intl.h"

+    #include "wx/utils.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 "wx/unix/execute.h"
 
 // for waitpid()


@@ -81,32 +81,3 @@ wxConsoleAppTraits::WaitForChild(wxExecuteData& execData)
     return exitcode;
 }
 
     return exitcode;
 }
 

-// ----------------------------------------------------------------------------
-// misc other stuff
-// ----------------------------------------------------------------------------
-
-// this is in mac/utils.cpp under Mac
-#ifndef __WXMAC__
-
-int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
-{
-    int major, minor;
-    char name[256];
-
-    if ( sscanf(WXWIN_OS_DESCRIPTION, "%255s %d.%d", name, &major, &minor) != 3 )
-    {
-        // unreckognized uname string format
-        major =
-        minor = -1;
-    }
-
-    if ( verMaj )
-        *verMaj = major;
-    if ( verMin )
-        *verMin = minor;
-
-    return wxUNIX;
-}
-
-#endif // __WXMAC__
-