Fixed nasty bug wxFont

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 45258f067b7e9a0b2f05012b2b26eab10dfa5729..61245d92c12e077abff8f89c0a5485f4fb79fd50 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -27,18 +27,6 @@
 class wxMask;
 class wxBitmap;
 
-//-----------------------------------------------------------------------------
-// also implemented here from wxImage
-//-----------------------------------------------------------------------------
-
-/*
-class wxImage : wxGDIObject
-{
-  wxImage( const wxBitmap &bitmap );
-  wxBitmap ConvertToBitmap() const;
-}
-*/
-
 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------
@@ -55,7 +43,7 @@ public:
   ~wxMask();
 
  // implementation
-    
+
   GdkBitmap   *m_bitmap;
   GdkBitmap *GetBitmap() const;
 };
@@ -75,14 +63,13 @@ public:
   wxBitmap( const char **bits );
   wxBitmap( char **bits );
   wxBitmap( const wxBitmap& bmp );
-  wxBitmap( const wxBitmap* bmp );
   wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM );
   ~wxBitmap();
   wxBitmap& operator = ( const wxBitmap& bmp );
   bool operator == ( const wxBitmap& bmp );
   bool operator != ( const wxBitmap& bmp );
   bool Ok() const;
-    
+
   int GetHeight() const;
   int GetWidth() const;
   int GetDepth() const;
@@ -96,14 +83,14 @@ public:
   wxPalette *GetPalette() const;
   wxPalette *GetColourMap() const
     { return GetPalette(); };
-      
-// implementation      
+
+// implementation
 
   void SetHeight( int height );
   void SetWidth( int width );
   void SetDepth( int depth );
   void SetPixmap( GdkPixmap *pixmap );
-  
+
   GdkPixmap *GetPixmap() const;
   GdkBitmap *GetBitmap() const;