X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/44216b3b2e8960c4573fd37aff5cbc9b35d002db..2bc1aa1174ee3ddd68615827c3531549cf204918:/include/wx/gtk/bitmap.h

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 379e0065e8..37c42b14c5 100644
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -2,10 +2,9 @@
 // Name:        bitmap.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -25,13 +24,6 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxDC;
-class wxPaintDC;
-class wxMemoryDC;
-class wxToolBar;
-class wxBitmapButton;
-class wxStaticBitmap;
-
 class wxMask;
 class wxBitmap;
 
@@ -41,51 +33,40 @@ class wxBitmap;
 
 class wxMask: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxMask)
-
-  public:
-
+public:
     wxMask();
     wxMask( const wxBitmap& bitmap, const wxColour& colour );
     wxMask( const wxBitmap& bitmap, int paletteIndex );
     wxMask( const wxBitmap& bitmap );
     ~wxMask();
-
-  private:
-
-    friend wxBitmap;
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxToolBar;
-    friend wxBitmapButton;
-    friend wxStaticBitmap;
-
+  
+    bool Create( const wxBitmap& bitmap, const wxColour& colour );
+    bool Create( const wxBitmap& bitmap, int paletteIndex );
+    bool Create( const wxBitmap& bitmap );
+
+    // implementation
+    GdkBitmap   *m_bitmap;
+    
     GdkBitmap *GetBitmap() const;
-
-  protected:
-
-    GdkBitmap *m_bitmap;
-
+  
+private:
+    DECLARE_DYNAMIC_CLASS(wxMask)
 };
 
 //-----------------------------------------------------------------------------
 // wxBitmap
 //-----------------------------------------------------------------------------
 
-// CMB 20/5/98: added xbm constructor and GetBitmap() method
 class wxBitmap: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxBitmap)
-
-  public:
-
+public:
     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 wxBitmap& bmp );
-    wxBitmap( const wxBitmap* bmp );
-    wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM);
+    wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM );
     ~wxBitmap();
     wxBitmap& operator = ( const wxBitmap& bmp );
     bool operator == ( const wxBitmap& bmp );
@@ -95,39 +76,31 @@ class wxBitmap: public wxObject
     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 );
 
-    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);
+    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(); };
+    { return GetPalette(); };
 
-  private:
+    // implementation
 
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxMemoryDC;
-    friend wxToolBar;
-    friend wxBitmapButton;
-    friend wxStaticBitmap;
+    void SetHeight( int height );
+    void SetWidth( int width );
+    void SetDepth( int depth );
+    void SetPixmap( GdkPixmap *pixmap );
 
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;
 
-    void DestroyImage();
-    void RecreateImage();
-    void Render();
-
     // no data :-)
+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 
 #endif // __GTKBITMAPH__