Include <wx/textctrl.h> from <wx/combobox.h> for compatibility.

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 30c517a8ba0835f2068c69f6ecd69ea85e426d56..8bc0ab32073f8a5db20b707e747bd7f56b8aec3a 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -21,6 +21,7 @@ class WXDLLIMPEXP_CORE wxMask: public wxMaskBase
 {
 public:
     wxMask();
+    wxMask(const wxMask& mask);
     wxMask( const wxBitmap& bitmap, const wxColour& colour );
 #if wxUSE_PALETTE
     wxMask( const wxBitmap& bitmap, int paletteIndex );
@@ -29,14 +30,17 @@ public:
     virtual ~wxMask();
 
     // implementation
-    GdkBitmap   *m_bitmap;
-    GdkBitmap *GetBitmap() const;
+    wxMask(GdkPixmap*);
+    GdkPixmap* GetBitmap() const;
 
 protected:
     virtual void FreeData();
     virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour);
     virtual bool InitFromMonoBitmap(const wxBitmap& bitmap);
 
+private:
+    GdkPixmap* m_bitmap;
+
     DECLARE_DYNAMIC_CLASS(wxMask)
 };
 
@@ -93,7 +97,7 @@ public:
 #if wxUSE_PALETTE
     wxPalette *GetPalette() const;
     void SetPalette(const wxPalette& palette);
-    wxPalette *GetColourMap() const { return GetPalette(); };
+    wxPalette *GetColourMap() const { return GetPalette(); }
 #endif // wxUSE_PALETTE
 
     static void InitStandardHandlers();