Reset wxPGEditor singleton instance pointers in dtors. This is useful if wxPropertyGr...

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

diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index 155adc1cf4a35051668b40623793396e7bbb8fe6..51caa8e009566d616e3d42187ca0e40af57f3a59 100644 (file)
--- a/src/motif/bmpmotif.cpp
+++ b/src/motif/bmpmotif.cpp
@@ -12,11 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
-#endif
-

 #include "wx/motif/bmpmotif.h"
 
 #ifndef WX_PRECOMP
 #include "wx/motif/bmpmotif.h"
 
 #ifndef WX_PRECOMP


@@ -41,7 +36,7 @@ Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 
 static inline wxCharBuffer GetCacheImageName(WXImage image)
 {
 
 static inline wxCharBuffer GetCacheImageName(WXImage image)
 {

-    return wxString::Format(_T("wxBitmap_%p"), image).ToAscii();
+    return wxString::Format(wxT("wxBitmap_%p"), image).ToAscii();

 }
 
 wxBitmapCache::~wxBitmapCache()
 }
 
 wxBitmapCache::~wxBitmapCache()


@@ -79,7 +74,7 @@ void wxBitmapCache::SetBitmap( const wxBitmap& bitmap )
         {
             XmUninstallImage( (XImage*)m_image );
             XtFree( (char*)(XImage*)m_image );
         {
             XmUninstallImage( (XImage*)m_image );
             XtFree( (char*)(XImage*)m_image );

-            m_image = (WXImage*)NULL;
+            m_image = NULL;

         }
     }
 }
         }
     }
 }


@@ -268,7 +263,7 @@ XCreateInsensitivePixmap( Display *display, Pixmap pixmap )
     stipple = XCreateBitmapFromData( display, pixmap, stipple_data, 16, 16 );
     if ( 0 != stipple )
     {
     stipple = XCreateBitmapFromData( display, pixmap, stipple_data, 16, 16 );
     if ( 0 != stipple )
     {

-        gc = XCreateGC( display, pixmap, (XtGCMask)0, (XGCValues*)NULL );
+        gc = XCreateGC( display, pixmap, (XtGCMask)0, NULL );

         if ( NULL != gc )
         {
             /* Create an identical copy of the argument pixmap.
         if ( NULL != gc )
         {
             /* Create an identical copy of the argument pixmap.