DoMenuUpdates()

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

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 1d6260c5fca6ce6de6af981494f75f91a59d7d05..95db695c3b209d75995c57ac1232d8e5885de545 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,7 +28,9 @@
 class wxDC;
 class wxPaintDC;
 class wxMemoryDC;
-class wxToolBarGTK;
+class wxToolBar;
+class wxBitmapButton;
+class wxStaticBitmap;
 
 class wxMask;
 class wxBitmap;
@@ -45,7 +47,7 @@ class wxMask: public wxObject
   
     wxMask(void);
     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);
 
@@ -54,7 +56,9 @@ class wxMask: public wxObject
     friend wxBitmap;
     friend wxDC;
     friend wxPaintDC;
-    friend wxToolBarGTK;
+    friend wxToolBar;
+    friend wxBitmapButton;
+    friend wxStaticBitmap;
     
     GdkBitmap *GetBitmap(void) const;
     
@@ -68,6 +72,7 @@ class wxMask: public wxObject
 // wxBitmap
 //-----------------------------------------------------------------------------
 
+// CMB 20/5/98: added xbm constructor and GetBitmap() method
 class wxBitmap: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxBitmap)
@@ -75,11 +80,12 @@ class wxBitmap: public wxObject
   public:
 
     wxBitmap(void);
-    wxBitmap( const int width, const int height, const int depth = -1 );
+    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( const wxString &filename, int type );
     ~wxBitmap(void);
     wxBitmap& operator = ( const wxBitmap& bmp );
     bool operator == ( const wxBitmap& bmp );
@@ -89,16 +95,18 @@ class wxBitmap: public wxObject
     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 );
+    void SetHeight( int height );
+    void SetWidth( int width );
+    void SetDepth( int depth );
 
     wxMask *GetMask(void) const;
     void SetMask( wxMask *mask );
     
-    bool SaveFile( const wxString &name, const int type, wxPalette *palette = NULL );
-    bool LoadFile( const wxString &name, const int type );
-        
+    void Resize( int height, int width );
+    
+    bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL );
+    bool LoadFile( const wxString &name, int type );
+
     wxPalette *GetPalette(void) const;
     wxPalette *GetColourMap(void) const
       { return GetPalette(); };
@@ -108,9 +116,16 @@ class wxBitmap: public wxObject
     friend wxDC;
     friend wxPaintDC;
     friend wxMemoryDC;
-    friend wxToolBarGTK;
+    friend wxToolBar;
+    friend wxBitmapButton;
+    friend wxStaticBitmap;
 
     GdkPixmap *GetPixmap(void) const;
+    GdkBitmap *GetBitmap(void) const;
+    
+    void DestroyImage(void);
+    void RecreateImage(void);
+    void Render(void);
     
     // no data :-)
 };