Added wxMenu::Delete() and fixed some menu deleted memory

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

diff --git a/include/wx/motif/bitmap.h b/include/wx/motif/bitmap.h
index e36fc5ecf6893bdd0d56352a4e184cbfc63feed3..644039ef0ab051319241fca426dfb8624be71143 100644 (file)
--- a/include/wx/motif/bitmap.h
+++ b/include/wx/motif/bitmap.h
@@ -136,7 +136,6 @@ public:
   // Copy constructors
   inline wxBitmap(const wxBitmap& bitmap)
   { Ref(bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }
   // Copy constructors
   inline wxBitmap(const wxBitmap& bitmap)
   { Ref(bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }

-  inline wxBitmap(const wxBitmap* bitmap) { if (bitmap) Ref(*bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }

 
   // Initialize with raw XBM data
   wxBitmap(const char bits[], int width, int height, int depth = 1);
 
   // Initialize with raw XBM data
   wxBitmap(const char bits[], int width, int height, int depth = 1);


@@ -145,7 +144,7 @@ public:
   wxBitmap(char **data, wxControl* control = NULL);
 
   // Load a file or resource
   wxBitmap(char **data, wxControl* control = NULL);
 
   // Load a file or resource

-  wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_XBM);
+  wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_XPM);

 
   // Constructor for generalised creation from data
   wxBitmap(void *data, long type, int width, int height, int depth = 1);
 
   // Constructor for generalised creation from data
   wxBitmap(void *data, long type, int width, int height, int depth = 1);


@@ -156,7 +155,7 @@ public:
 
   virtual bool Create(int width, int height, int depth = -1);
   virtual bool Create(void *data, long type, int width, int height, int depth = 1);
 
   virtual bool Create(int width, int height, int depth = -1);
   virtual bool Create(void *data, long type, int width, int height, int depth = 1);

-  virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_XBM);
+  virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_XPM);

   virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);
 
   inline bool Ok() const { return (M_BITMAPDATA && M_BITMAPDATA->m_ok); }
   virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);
 
   inline bool Ok() const { return (M_BITMAPDATA && M_BITMAPDATA->m_ok); }


@@ -198,10 +197,15 @@ public:
   inline WXDisplay* GetPixmap() const { return M_BITMAPDATA->m_pixmap; }
   virtual WXPixmap GetLabelPixmap(WXWidget w) ;
   virtual WXPixmap GetArmPixmap(WXWidget w) ;
   inline WXDisplay* GetPixmap() const { return M_BITMAPDATA->m_pixmap; }
   virtual WXPixmap GetLabelPixmap(WXWidget w) ;
   virtual WXPixmap GetArmPixmap(WXWidget w) ;

-  virtual WXPixmap GetInsensPixmap(WXWidget w) ;
+  virtual WXPixmap GetInsensPixmap(WXWidget w = (WXWidget) 0) ;

 
 protected:
   static wxList sm_handlers;
 };
 
 protected:
   static wxList sm_handlers;
 };

+
+// Creates a bitmap with transparent areas drawn in
+// the given colour.
+wxBitmap wxCreateMaskedBitmap(wxBitmap& bitmap, wxColour& colour);
+

 #endif
   // _WX_BITMAP_H_
 #endif
   // _WX_BITMAP_H_