X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66c135f346165a716b91a77df96805193dcf1a30..0d559d69c8115c8aaabba70f37d49b4effbc2ab2:/include/wx/gtk/bitmap.h diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index 61f2bb2708..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,17 +25,6 @@ // classes //----------------------------------------------------------------------------- -class wxDC; -class wxPaintDC; -class wxMemoryDC; -class wxToolBar; -class wxBitmapButton; -class wxStaticBitmap; -class wxFrame; -class wxDialog; -class wxTreeCtrl; -class wxNotebook; - class wxMask; class wxBitmap; @@ -55,22 +44,13 @@ class wxMask: public wxObject wxMask( const wxBitmap& bitmap ); ~wxMask(); - private: - - friend wxBitmap; - friend wxDC; - friend wxPaintDC; - friend wxToolBar; - friend wxBitmapButton; - friend wxStaticBitmap; - friend wxFrame; - friend wxDialog; - friend wxTreeCtrl; - friend wxNotebook; - + // implementation + GdkBitmap *GetBitmap() const; protected: + + friend wxBitmap; GdkBitmap *m_bitmap; @@ -118,23 +98,12 @@ class wxBitmap: public wxObject wxPalette *GetPalette() const; wxPalette *GetColourMap() const { return GetPalette(); }; - - private: - - friend wxDC; - friend wxPaintDC; - friend wxMemoryDC; - friend wxToolBar; - friend wxBitmapButton; - friend wxStaticBitmap; - friend wxFrame; - friend wxDialog; - friend wxTreeCtrl; - friend wxNotebook; + + // implementation GdkPixmap *GetPixmap() const; GdkBitmap *GetBitmap() const; - + void DestroyImage(); void RecreateImage(); void Render();