Small fixes to wxChoice, wxComboBox and wxListBox

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

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 379e0065e8d258f257de47e83edcef0410fbd518..18f13ad7e3fe0d3e81f91f60d433028e4a616086 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -31,6 +31,9 @@ class wxMemoryDC;
 class wxToolBar;
 class wxBitmapButton;
 class wxStaticBitmap;
 class wxToolBar;
 class wxBitmapButton;
 class wxStaticBitmap;

+class wxFrame;
+class wxDialog;
+class wxTreeCtrl;

 
 class wxMask;
 class wxBitmap;
 
 class wxMask;
 class wxBitmap;


@@ -59,6 +62,9 @@ class wxMask: public wxObject
     friend wxToolBar;
     friend wxBitmapButton;
     friend wxStaticBitmap;
     friend wxToolBar;
     friend wxBitmapButton;
     friend wxStaticBitmap;

+    friend wxFrame;
+    friend wxDialog;
+    friend wxTreeCtrl;

 
     GdkBitmap *GetBitmap() const;
 
 
     GdkBitmap *GetBitmap() const;
 


@@ -104,7 +110,7 @@ class wxBitmap: public wxObject
 
     void Resize( int height, int width );
 
 
     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;
     bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM);
 
     wxPalette *GetPalette() const;


@@ -119,6 +125,9 @@ class wxBitmap: public wxObject
     friend wxToolBar;
     friend wxBitmapButton;
     friend wxStaticBitmap;
     friend wxToolBar;
     friend wxBitmapButton;
     friend wxStaticBitmap;

+    friend wxFrame;
+    friend wxDialog;
+    friend wxTreeCtrl;

 
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;
 
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;