Minor additions to make working with binary buffers easier.

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 8449a01cdb8467d1d68cecba4bb28bd254e9a7a6..17ef65088864be099bf945af4aca2c7206789a51 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -64,8 +64,8 @@ public:
     wxBitmap();
     wxBitmap( int width, int height, int depth = -1 );
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
     wxBitmap();
     wxBitmap( int width, int height, int depth = -1 );
     wxBitmap( const char bits[], int width, int height, int depth = 1 );

-    wxBitmap( const char **bits );
-    wxBitmap( char **bits );
+    wxBitmap( const char **bits ) { (void)CreateFromXpm(bits); }
+    wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }

     wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM );
     ~wxBitmap();
     wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM );
     ~wxBitmap();


@@ -80,6 +80,8 @@ public:
 
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );
 
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );

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

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


@@ -95,10 +97,14 @@ public:
     void SetWidth( int width );
     void SetDepth( int depth );
     void SetPixmap( GdkPixmap *pixmap );
     void SetWidth( int width );
     void SetDepth( int depth );
     void SetPixmap( GdkPixmap *pixmap );

+    void SetBitmap( GdkBitmap *bitmap );

 
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;
     
 
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;
     

+protected:
+    bool CreateFromXpm(const char **bits);
+

 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };