X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/44216b3b2e8960c4573fd37aff5cbc9b35d002db..8a9523f25dbdf9f80382276a419032cfe7f72f4c:/include/wx/gtk/bitmap.h diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index 379e0065e8..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; @@ -51,18 +44,13 @@ class wxMask: public wxObject wxMask( const wxBitmap& bitmap ); ~wxMask(); - private: - - friend wxBitmap; - friend wxDC; - friend wxPaintDC; - friend wxToolBar; - friend wxBitmapButton; - friend wxStaticBitmap; - + // implementation + GdkBitmap *GetBitmap() const; protected: + + friend wxBitmap; GdkBitmap *m_bitmap; @@ -104,21 +92,14 @@ class wxBitmap: public wxObject void Resize( int height, int width ); - bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL ); + 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(); }; - - private: - - friend wxDC; - friend wxPaintDC; - friend wxMemoryDC; - friend wxToolBar; - friend wxBitmapButton; - friend wxStaticBitmap; + + // implementation GdkPixmap *GetPixmap() const; GdkBitmap *GetBitmap() const;