X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/716b736420b6f9722f44c53931ceeeb23e8e54e4..2aa45cc91981cbf8be5d6c63c3fda99b530cf308:/include/wx/gtk/bitmap.h?ds=sidebyside

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 95db695c3b..81406d49ec 100644
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -25,13 +25,6 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxDC;
-class wxPaintDC;
-class wxMemoryDC;
-class wxToolBar;
-class wxBitmapButton;
-class wxStaticBitmap;
-
 class wxMask;
 class wxBitmap;
 
@@ -44,28 +37,23 @@ class wxMask: public wxObject
   DECLARE_DYNAMIC_CLASS(wxMask)
 
   public:
-  
-    wxMask(void);
+
+    wxMask();
     wxMask( const wxBitmap& bitmap, const wxColour& colour );
     wxMask( const wxBitmap& bitmap, int paletteIndex );
     wxMask( const wxBitmap& bitmap );
-    ~wxMask(void);
+    ~wxMask();
 
-  private:
-  
-    friend wxBitmap;
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxToolBar;
-    friend wxBitmapButton;
-    friend wxStaticBitmap;
-    
-    GdkBitmap *GetBitmap(void) const;
+  // implementation
     
+    GdkBitmap *GetBitmap() const;
+
   protected:
   
-    GdkBitmap *m_bitmap;     
-    
+    friend wxBitmap;
+
+    GdkBitmap *m_bitmap;
+
 };
 
 //-----------------------------------------------------------------------------
@@ -79,54 +67,47 @@ class wxBitmap: public wxObject
 
   public:
 
-    wxBitmap(void);
+    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, 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;
+    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(void) const;
+    wxMask *GetMask() const;
     void SetMask( wxMask *mask );
-    
+
     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
+    bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL );
+    bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM);
+
+    wxPalette *GetPalette() const;
+    wxPalette *GetColourMap() const
       { return GetPalette(); };
+      
+  // implementation      
+
+    GdkPixmap *GetPixmap() const;
+    GdkBitmap *GetBitmap() const;
+
+    void DestroyImage();
+    void RecreateImage();
+    void Render();
 
-  private:
-  
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxMemoryDC;
-    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 :-)
 };