fixed wxOverlay to handle wxWindowDC/wxClientDC in the same way wxMac does

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

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index dea805a657979463c9c3c34c9d58bfc322c2cf25..c3b452d42b46ec1e82c17fa6aac1fca3a9cb5bef 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -28,11 +28,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/dcmemory.h"
+    #include "wx/bitmap.h"
 #endif
 
 #include "wx/apptrait.h"
-#include "wx/dcmemory.h"
-#include "wx/bitmap.h"
 #include "wx/evtloop.h"
 
 #include <string.h>
@@ -143,30 +143,18 @@ void wxBell()
 }
 #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)
 // ----------------------------------------------------------------------------
@@ -983,7 +971,7 @@ wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, const wxColour& colour)
     wxMemoryDC destDC;
     wxMemoryDC srcDC;
 
-    srcDC.SelectObject(bitmap);
+    srcDC.SelectObjectAsSource(bitmap);
     destDC.SelectObject(newBitmap);
 
     wxBrush brush(colour, wxSOLID);