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
This commit is contained in:
Jouk Jansen 2003-06-30 12:56:42 +00:00
parent 04272d5883
commit d48568a5ec
2 changed files with 5 additions and 1 deletions

View File

@ -75,6 +75,7 @@ OBJECTS = \
toplevel.obj,\ toplevel.obj,\
timer.obj,\ timer.obj,\
toolbar.obj,\ toolbar.obj,\
utils.obj,\
window.obj window.obj
SOURCES = \ SOURCES = \
@ -128,6 +129,7 @@ SOURCES = \
toplevel.cpp,\ toplevel.cpp,\
timer.cpp,\ timer.cpp,\
toolbar.cpp,\ toolbar.cpp,\
utils.cpp,\
window.cpp,\ window.cpp,\
[.xmcombo]xmcombo.c\ [.xmcombo]xmcombo.c\
@ -190,4 +192,5 @@ textctrl.obj : textctrl.cpp
toplevel.obj : toplevel.cpp toplevel.obj : toplevel.cpp
timer.obj : timer.cpp timer.obj : timer.cpp
toolbar.obj : toolbar.cpp toolbar.obj : toolbar.cpp
utils.obj : utils.cpp
window.obj : window.cpp window.obj : window.cpp

View File

@ -22,6 +22,7 @@
#endif #endif
#include "wx/setup.h" #include "wx/setup.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/apptrait.h"
#include "wx/app.h" #include "wx/app.h"
#include "wx/dcmemory.h" #include "wx/dcmemory.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
@ -132,7 +133,7 @@ void wxBell()
XBell (wxGlobalDisplay(), 0); XBell (wxGlobalDisplay(), 0);
} }
int wxGetOsVersion(int *majorVsn, int *minorVsn) int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
{ {
// FIXME TODO // FIXME TODO
// This code is WRONG!! Does NOT return the // This code is WRONG!! Does NOT return the