calling insert("") would provoke an assert - now it's just ignored

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 42f2dabc5a87130bd35371b277141b4f783a3ce4..f96d9d4684ee1ae9cb0812ac88b1d3d13f8e7dfc 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -28,7 +28,12 @@
 class wxDC;
 class wxPaintDC;
 class wxMemoryDC;
-class wxToolBarGTK;
+class wxToolBar;
+class wxBitmapButton;
+class wxStaticBitmap;
+class wxFrame;
+class wxDialog;
+class wxTreeCtrl;
 
 class wxMask;
 class wxBitmap;
@@ -42,26 +47,31 @@ class wxMask: public wxObject
   DECLARE_DYNAMIC_CLASS(wxMask)
 
   public:
-  
-    wxMask(void);
+
+    wxMask();
     wxMask( const wxBitmap& bitmap, const wxColour& colour );
-    wxMask( const wxBitmap& bitmap, const int paletteIndex );
+    wxMask( const wxBitmap& bitmap, int paletteIndex );
     wxMask( const wxBitmap& bitmap );
-    ~wxMask(void);
+    ~wxMask();
 
   private:
-  
+
     friend wxBitmap;
     friend wxDC;
     friend wxPaintDC;
-    friend wxToolBarGTK;
-    
-    GdkBitmap *GetBitmap(void) const;
-    
+    friend wxToolBar;
+    friend wxBitmapButton;
+    friend wxStaticBitmap;
+    friend wxFrame;
+    friend wxDialog;
+    friend wxTreeCtrl;
+
+    GdkBitmap *GetBitmap() const;
+
   protected:
-  
-    GdkBitmap *m_bitmap;     
-    
+
+    GdkBitmap *m_bitmap;
+
 };
 
 //-----------------------------------------------------------------------------
@@ -75,46 +85,57 @@ class wxBitmap: public wxObject
 
   public:
 
-    wxBitmap(void);
-    wxBitmap( const int width, const int height, const int depth = -1 );
-    wxBitmap( const char bits[], const int width, const int height, const int depth = 1 );
+    wxBitmap();
+    wxBitmap( int width, int height, int depth = -1 );
+    wxBitmap( const char bits[], int width, int height, int depth = 1 );
     wxBitmap( char **bits );
     wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxBitmap* bmp );
-    wxBitmap( const wxString &filename, const int type );
-    ~wxBitmap(void);
+    wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM);
+    ~wxBitmap();
     wxBitmap& operator = ( const wxBitmap& bmp );
     bool operator == ( const wxBitmap& bmp );
     bool operator != ( const wxBitmap& bmp );
-    bool Ok(void) const;
-    
-    int GetHeight(void) const;
-    int GetWidth(void) const;
-    int GetDepth(void) const;
-    void SetHeight( const int height );
-    void SetWidth( const int width );
-    void SetDepth( const int depth );
-
-    wxMask *GetMask(void) const;
+    bool Ok() const;
+
+    int GetHeight() const;
+    int GetWidth() const;
+    int GetDepth() const;
+    void SetHeight( int height );
+    void SetWidth( int width );
+    void SetDepth( int depth );
+
+    wxMask *GetMask() const;
     void SetMask( wxMask *mask );
-    
-    bool SaveFile( const wxString &name, const int type, wxPalette *palette = NULL );
-    bool LoadFile( const wxString &name, const int type );
-        
-    wxPalette *GetPalette(void) const;
-    wxPalette *GetColourMap(void) const
+
+    void Resize( int height, int width );
+
+    bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL );
+    bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM);
+
+    wxPalette *GetPalette() const;
+    wxPalette *GetColourMap() const
       { return GetPalette(); };
 
   private:
-  
+
     friend wxDC;
     friend wxPaintDC;
     friend wxMemoryDC;
-    friend wxToolBarGTK;
+    friend wxToolBar;
+    friend wxBitmapButton;
+    friend wxStaticBitmap;
+    friend wxFrame;
+    friend wxDialog;
+    friend wxTreeCtrl;
+
+    GdkPixmap *GetPixmap() const;
+    GdkBitmap *GetBitmap() const;
+
+    void DestroyImage();
+    void RecreateImage();
+    void Render();
 
-    GdkPixmap *GetPixmap(void) const;
-    GdkBitmap *GetBitmap(void) const;
-    
     // no data :-)
 };