wxGTK compilation fixes

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 35d5c3008a617a2b392089583cba82209b96d420..b49423e6b13328ab164735712569e8f0b31c24b0 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -19,7 +19,6 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/palette.h"
-#include "wx/image.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -42,9 +41,13 @@ public:
   wxMask( const wxBitmap& bitmap, int paletteIndex );
   wxMask( const wxBitmap& bitmap );
   ~wxMask();
+  
+  bool Create( const wxBitmap& bitmap, const wxColour& colour );
+  bool Create( const wxBitmap& bitmap, int paletteIndex );
+  bool Create( const wxBitmap& bitmap );
 
  // implementation
-    
+
   GdkBitmap   *m_bitmap;
   GdkBitmap *GetBitmap() const;
 };
@@ -61,26 +64,19 @@ public:
   wxBitmap();
   wxBitmap( int width, int height, int depth = -1 );
   wxBitmap( const char bits[], int width, int height, int depth = 1 );
-  wxBitmap( const wxImage &image );
   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;
-    
-  wxImage ConvertToImage() const;
 
   int GetHeight() const;
   int GetWidth() const;
   int GetDepth() const;
-  void SetHeight( int height );
-  void SetWidth( int width );
-  void SetDepth( int depth );
 
   wxMask *GetMask() const;
   void SetMask( wxMask *mask );
@@ -91,8 +87,13 @@ 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;