Removed removal of config.log which is stupid and hinders debugging.

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index f96d9d4684ee1ae9cb0812ac88b1d3d13f8e7dfc..81406d49ecee9a1fcea68de40ef9f45a0a424282 100644 (file)
--- 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
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -25,16 +25,6 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxDC;
-class wxPaintDC;
-class wxMemoryDC;
-class wxToolBar;
-class wxBitmapButton;
-class wxStaticBitmap;
-class wxFrame;
-class wxDialog;
-class wxTreeCtrl;
-

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


@@ -54,21 +44,13 @@ class wxMask: public wxObject
     wxMask( const wxBitmap& bitmap );
     ~wxMask();
 
     wxMask( const wxBitmap& bitmap );
     ~wxMask();
 

-  private:
-
-    friend wxBitmap;
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxToolBar;
-    friend wxBitmapButton;
-    friend wxStaticBitmap;
-    friend wxFrame;
-    friend wxDialog;
-    friend wxTreeCtrl;
-
+  // implementation
+    

     GdkBitmap *GetBitmap() const;
 
   protected:
     GdkBitmap *GetBitmap() const;
 
   protected:

+  
+    friend wxBitmap;

 
     GdkBitmap *m_bitmap;
 
 
     GdkBitmap *m_bitmap;
 


@@ -110,24 +92,14 @@ 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;
     wxPalette *GetColourMap() const
       { return GetPalette(); };
     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;
-    friend wxFrame;
-    friend wxDialog;
-    friend wxTreeCtrl;
+      
+  // implementation      

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