compile fix for Mac

[wxWidgets.git] / src / motif / utils.cpp

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index fa3ba9073fc305409722110d0eeaa60e648f3fd4..84bc1a6d9a527152998628c5d26243911d841e32 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -25,10 +25,14 @@
 #endif
 
 #include "wx/utils.h"
 #endif
 
 #include "wx/utils.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/dcmemory.h"
+    #include "wx/bitmap.h"
+#endif
+

 #include "wx/apptrait.h"
 #include "wx/apptrait.h"

-#include "wx/app.h"
-#include "wx/dcmemory.h"
-#include "wx/bitmap.h"

 #include "wx/evtloop.h"
 
 #include <string.h>
 #include "wx/evtloop.h"
 
 #include <string.h>


@@ -139,30 +143,18 @@ void wxBell()
 }
 #endif
 
 }
 #endif
 

-wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const

 {
 {

-    static wxToolkitInfo info;
+    // XmVERSION and XmREVISION are defined in Xm/Xm.h
+    if ( verMaj )
+        *verMaj = XmVERSION;
+    if ( verMin )
+        *verMin = XmREVISION;

 
 

-    info.shortName = _T("motif");
-    info.name = _T("wxMotif");
-#ifdef __WXUNIVERSAL__
-    info.shortName << _T("univ");
-    info.name << _T("/wxUniversal");
-#endif
-    // FIXME TODO
-    // This code is WRONG!! Does NOT return the
-    // Motif version of the libs but the X protocol
-    // version!
-    Display *display = wxGlobalDisplay();
-    if (display)
-    {
-        info.versionMajor = ProtocolVersion (display);
-        info.versionMinor = ProtocolRevision (display);
-    }
-    info.os = wxMOTIF_X;
-    return info;
+    return wxPORT_MOTIF;

 }
 
 }
 

+

 // ----------------------------------------------------------------------------
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 // ----------------------------------------------------------------------------