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 fe5f8eddec01b89938a1df0fc46a891b192ce9ae..18f13ad7e3fe0d3e81f91f60d433028e4a616086 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -32,6 +32,7 @@ class wxToolBar;
 class wxBitmapButton;
 class wxStaticBitmap;
 class wxFrame;
+class wxDialog;
 class wxTreeCtrl;
 
 class wxMask;
@@ -62,6 +63,7 @@ class wxMask: public wxObject
     friend wxBitmapButton;
     friend wxStaticBitmap;
     friend wxFrame;
+    friend wxDialog;
     friend wxTreeCtrl;
 
     GdkBitmap *GetBitmap() const;
@@ -108,7 +110,7 @@ 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;
@@ -124,6 +126,7 @@ class wxBitmap: public wxObject
     friend wxBitmapButton;
     friend wxStaticBitmap;
     friend wxFrame;
+    friend wxDialog;
     friend wxTreeCtrl;
 
     GdkPixmap *GetPixmap() const;