compilation fix for recent commit

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

diff --git a/include/wx/motif/bitmap.h b/include/wx/motif/bitmap.h
index 6cc1da17659191f32805741bdbf1770da8fff33e..d44ba42386f74f293ddbb39c8e6f0f0ad4749842 100644 (file)
--- a/include/wx/motif/bitmap.h
+++ b/include/wx/motif/bitmap.h
@@ -27,6 +27,7 @@ class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxBitmapHandler;
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxBitmapHandler;
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxCursor;

+class WXDLLEXPORT wxImage;

 
 // A mask is a mono bitmap used for drawing bitmaps
 // transparently.
 
 // A mask is a mono bitmap used for drawing bitmaps
 // transparently.


@@ -135,13 +136,17 @@ public:
 
   // Copy constructors
   wxBitmap(const wxBitmap& bitmap)
 
   // Copy constructors
   wxBitmap(const wxBitmap& bitmap)

-  { Ref(bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }
+  { Ref(bitmap); }

 
   // 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);
 

-  // Initialize with XPM data
-  wxBitmap(char **data, wxControl* control = NULL);
+  // from XPM
+  wxBitmap(const char **data) { (void)CreateFromXpm(data); }
+  wxBitmap(char **data) { (void)CreateFromXpm((const char **)data); }
+
+  // Initialize with XPM data -- deprecated
+  wxBitmap(char **data, wxControl* control);

 
   // Load a file or resource
   wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_XPM);
 
   // Load a file or resource
   wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_XPM);


@@ -151,12 +156,21 @@ public:
 
   // If depth is omitted, will create a bitmap compatible with the display
   wxBitmap(int width, int height, int depth = -1);
 
   // If depth is omitted, will create a bitmap compatible with the display
   wxBitmap(int width, int height, int depth = -1);

+
+  // Convert from wxImage:  
+  wxBitmap(const wxImage& image, int depth = -1) { (void)CreateFromImage(image, depth); }
+

   ~wxBitmap();
 
   virtual bool Create(int width, int height, int depth = -1);
   virtual bool Create(void *data, long type, int width, int height, int depth = 1);
   ~wxBitmap();
 
   virtual bool Create(int width, int height, int depth = -1);
   virtual bool Create(void *data, long type, int width, int height, int depth = 1);

+   
+   wxBitmap GetSubBitmap( const wxRect& rect ) const;
+   

   virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_XPM);
   virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);
   virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_XPM);
   virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);

+    
+  wxImage ConvertToImage() const;

 
   bool Ok() const { return (M_BITMAPDATA && M_BITMAPDATA->m_ok); }
   int GetWidth() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_width : 0); }
 
   bool Ok() const { return (M_BITMAPDATA && M_BITMAPDATA->m_ok); }
   int GetWidth() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_width : 0); }


@@ -176,8 +190,8 @@ public:
   void SetMask(wxMask *mask) ;
 
   wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }
   void SetMask(wxMask *mask) ;
 
   wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }

-  bool operator == (const wxBitmap& bitmap) { return m_refData == bitmap.m_refData; }
-  bool operator != (const wxBitmap& bitmap) { return m_refData != bitmap.m_refData; }
+  bool operator == (const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }
+  bool operator != (const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; }

 
   // Format handling
   static wxList& GetHandlers() { return sm_handlers; }
 
   // Format handling
   static wxList& GetHandlers() { return sm_handlers; }


@@ -194,18 +208,23 @@ public:
   // Motif implementation
 public:
   WXDisplay* GetDisplay() const { return M_BITMAPDATA->m_display; }
   // 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) ;
   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;
 
 protected:
   static wxList sm_handlers;

+
+protected:
+    bool CreateFromXpm(const char **bits);
+    bool CreateFromImage(const wxImage& image, int depth);    

 };
 
 // Creates a bitmap with transparent areas drawn in
 // the given colour.
 };
 
 // Creates a bitmap with transparent areas drawn in
 // the given colour.

-wxBitmap wxCreateMaskedBitmap(wxBitmap& bitmap, wxColour& colour);
+wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, wxColour& colour);

 
 #endif
   // _WX_BITMAP_H_
 
 #endif
   // _WX_BITMAP_H_