Committing in .

 fix for new getosversion procedure.

 Modified Files:
 	wxWindows/src/motif/descrip.mms wxWindows/src/motif/utils.cpp
 ----------------------------------------------------------------------

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

diff --git a/src/motif/descrip.mms b/src/motif/descrip.mms
index b872442739f2a4d75808f99930919e49e130263e..6e86386049b0b8a751823c4b81d398758dcf046b 100644 (file)
--- a/src/motif/descrip.mms
+++ b/src/motif/descrip.mms
@@ -75,6 +75,7 @@ OBJECTS = \
                toplevel.obj,\
                timer.obj,\
                toolbar.obj,\
+               utils.obj,\
                window.obj
 
 SOURCES = \
@@ -128,6 +129,7 @@ SOURCES = \
                toplevel.cpp,\
                timer.cpp,\
                toolbar.cpp,\
+               utils.cpp,\
                window.cpp,\
                [.xmcombo]xmcombo.c\
 
@@ -190,4 +192,5 @@ textctrl.obj : textctrl.cpp
 toplevel.obj : toplevel.cpp
 timer.obj : timer.cpp
 toolbar.obj : toolbar.cpp
+utils.obj : utils.cpp
 window.obj : window.cpp

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 44cf0a4c56e3437e7a7634e5c0dc141c9bd5e0c2..01c0719c0c7e32c21b59c91adc3d256a8f17beaa 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -22,6 +22,7 @@
 #endif
 #include "wx/setup.h"
 #include "wx/utils.h"
+#include "wx/apptrait.h"
 #include "wx/app.h"
 #include "wx/dcmemory.h"
 #include "wx/bitmap.h"
@@ -132,7 +133,7 @@ void wxBell()
     XBell (wxGlobalDisplay(), 0);
 }
 
-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
 {
     // FIXME TODO
     // This code is WRONG!! Does NOT return the