X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4bc67cc550bcd9d5f93f88ae22a4f6ac7fafb5f7..b666df2c102d1e183532adf0c003e63b1a591e2f:/include/wx/gtk/bitmap.h diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index 45258f067b..61245d92c1 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -27,18 +27,6 @@ class wxMask; class wxBitmap; -//----------------------------------------------------------------------------- -// also implemented here from wxImage -//----------------------------------------------------------------------------- - -/* -class wxImage : wxGDIObject -{ - wxImage( const wxBitmap &bitmap ); - wxBitmap ConvertToBitmap() const; -} -*/ - //----------------------------------------------------------------------------- // wxMask //----------------------------------------------------------------------------- @@ -55,7 +43,7 @@ public: ~wxMask(); // implementation - + GdkBitmap *m_bitmap; GdkBitmap *GetBitmap() const; }; @@ -75,14 +63,13 @@ public: 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; - + int GetHeight() const; int GetWidth() const; int GetDepth() const; @@ -96,14 +83,14 @@ public: wxPalette *GetPalette() const; wxPalette *GetColourMap() const { return GetPalette(); }; - -// implementation + +// implementation void SetHeight( int height ); void SetWidth( int width ); void SetDepth( int depth ); void SetPixmap( GdkPixmap *pixmap ); - + GdkPixmap *GetPixmap() const; GdkBitmap *GetBitmap() const;