1. wxShell fixes: now really uses shell (it wasn't different from wxExecute!)

[wxWidgets.git] / include / wx / motif / bitmap.h

diff --git a/include/wx/motif/bitmap.h b/include/wx/motif/bitmap.h
index 17b7142ce7ce02967eaa4921f0d913fd115fa982..c673a408fabce15b5d390680f6a32713d1b8272b 100644 (file)
--- a/include/wx/motif/bitmap.h
+++ b/include/wx/motif/bitmap.h
@@ -201,10 +201,11 @@ public:
   // Motif implementation
 public:
   WXDisplay* GetDisplay() const { return M_BITMAPDATA->m_display; }
-  WXDisplay* GetPixmap() const { return M_BITMAPDATA->m_pixmap; }
+  WXPixmap GetPixmap() const { return (WXPixmap) M_BITMAPDATA->m_pixmap; }
   virtual WXPixmap GetLabelPixmap(WXWidget w) ;
   virtual WXPixmap GetArmPixmap(WXWidget w) ;
   virtual WXPixmap GetInsensPixmap(WXWidget w = (WXWidget) 0) ;
+  void SetPixmapNull() { M_BITMAPDATA->m_pixmap = 0; }
 
 protected:
   static wxList sm_handlers;