wxWindow::IsShown() made 'const'

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 3d7e90c69b83b9ce7b780f3c67df55fc699dfcea..876eba22490bcf294c5c2d0501e35035bd863c45 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/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
 /////////////////////////////////////////////////////////////////////////////
@@ -25,6 +25,13 @@
 // classes
 //-----------------------------------------------------------------------------
 
+class wxDC;
+class wxPaintDC;
+class wxMemoryDC;
+class wxToolBarGTK;
+class wxBitmapButton;
+class wxStaticBitmap;
+
 class wxMask;
 class wxBitmap;
 
@@ -40,12 +47,19 @@ 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);
 
-  public:
+  private:
   
+    friend wxBitmap;
+    friend wxDC;
+    friend wxPaintDC;
+    friend wxToolBarGTK;
+    friend wxBitmapButton;
+    friend wxStaticBitmap;
+    
     GdkBitmap *GetBitmap(void) const;
     
   protected:
@@ -58,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)
@@ -65,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 );
@@ -79,23 +95,31 @@ 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 );
-        
+    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(); };
 
-  public:
+  private:
+  
+    friend wxDC;
+    friend wxPaintDC;
+    friend wxMemoryDC;
+    friend wxToolBarGTK;
+    friend wxBitmapButton;
+    friend wxStaticBitmap;
 
     GdkPixmap *GetPixmap(void) const;
+    GdkBitmap *GetBitmap(void) const;
     
     // no data :-)
 };