removed redundant code

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

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 45258f067b7e9a0b2f05012b2b26eab10dfa5729..3de03236153221e6b60d863221369668cdd28a30 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -19,6 +19,7 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/palette.h"
+#include "wx/gdiobj.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -26,18 +27,7 @@
 
 class wxMask;
 class wxBitmap;
-
-//-----------------------------------------------------------------------------
-// also implemented here from wxImage
-//-----------------------------------------------------------------------------
-
-/*
-class wxImage : wxGDIObject
-{
-  wxImage( const wxBitmap &bitmap );
-  wxBitmap ConvertToBitmap() const;
-}
-*/
+class wxImage;
 
 //-----------------------------------------------------------------------------
 // wxMask
@@ -45,69 +35,88 @@ class wxImage : wxGDIObject
 
 class wxMask: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxMask)
-
 public:
-  wxMask();
-  wxMask( const wxBitmap& bitmap, const wxColour& colour );
-  wxMask( const wxBitmap& bitmap, int paletteIndex );
-  wxMask( const wxBitmap& bitmap );
-  ~wxMask();
+    wxMask();
+    wxMask( const wxBitmap& bitmap, const wxColour& colour );
+    wxMask( const wxBitmap& bitmap, int paletteIndex );
+    wxMask( const wxBitmap& bitmap );
+    ~wxMask();
+  
+    bool Create( const wxBitmap& bitmap, const wxColour& colour );
+    bool Create( const wxBitmap& bitmap, int paletteIndex );
+    bool Create( const wxBitmap& bitmap );
 
- // implementation
+    // implementation
+    GdkBitmap   *m_bitmap;
     
-  GdkBitmap   *m_bitmap;
-  GdkBitmap *GetBitmap() const;
+    GdkBitmap *GetBitmap() const;
+  
+private:
+    DECLARE_DYNAMIC_CLASS(wxMask)
 };
 
 //-----------------------------------------------------------------------------
 // wxBitmap
 //-----------------------------------------------------------------------------
 
-class wxBitmap: public wxObject
+class wxBitmap: public wxGDIObject
 {
-  DECLARE_DYNAMIC_CLASS(wxBitmap)
-
 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();
-  wxBitmap& operator = ( const wxBitmap& bmp );
-  bool operator == ( const wxBitmap& bmp );
-  bool operator != ( const wxBitmap& bmp );
-  bool Ok() const;
+    wxBitmap();
+    wxBitmap( int width, int height, int depth = -1 );
+    wxBitmap( const char bits[], int width, int height, int depth = 1 );
+    wxBitmap( const char **bits ) { (void)CreateFromXpm(bits); }
+    wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
+    wxBitmap( const wxBitmap& bmp );
+    wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM );
+    wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
+    ~wxBitmap();
+    wxBitmap& operator = ( const wxBitmap& bmp );
+    bool operator == ( const wxBitmap& bmp ) const;
+    bool operator != ( const wxBitmap& bmp ) const;
+    bool Ok() const;
+
+    bool Create(int width, int height, int depth = -1);
+    
+    int GetHeight() const;
+    int GetWidth() const;
+    int GetDepth() const;
     
-  int GetHeight() const;
-  int GetWidth() const;
-  int GetDepth() const;
+    wxImage ConvertToImage() const;
 
-  wxMask *GetMask() const;
-  void SetMask( wxMask *mask );
+    // copies the contents and mask of the given (colour) icon to the bitmap
+    virtual bool CopyFromIcon(const wxIcon& icon);
+
+    wxMask *GetMask() const;
+    void SetMask( wxMask *mask );
+    
+    wxBitmap GetSubBitmap( const wxRect& rect ) const;
 
-  bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) 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
+    wxPalette *GetPalette() const;
+    wxPalette *GetColourMap() const
     { return GetPalette(); };
-      
-// implementation      
 
-  void SetHeight( int height );
-  void SetWidth( int width );
-  void SetDepth( int depth );
-  void SetPixmap( GdkPixmap *pixmap );
-  
-  GdkPixmap *GetPixmap() const;
-  GdkBitmap *GetBitmap() const;
+    // implementation
+    // --------------
+
+    void SetHeight( int height );
+    void SetWidth( int width );
+    void SetDepth( int depth );
+    void SetPixmap( GdkPixmap *pixmap );
+    void SetBitmap( GdkBitmap *bitmap );
+
+    GdkPixmap *GetPixmap() const;
+    GdkBitmap *GetBitmap() const;
+    
+protected:
+    bool CreateFromXpm(const char **bits);
+    bool CreateFromImage(const wxImage& image, int depth);
 
-    // no data :-)
+private:
+    DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 
 #endif // __GTKBITMAPH__