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 560dfa24d0cdd7a330802e0fa68e36ba67f7d475..8bc0ab32073f8a5db20b707e747bd7f56b8aec3a 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -30,7 +30,7 @@ public:
     virtual ~wxMask();
 
     // implementation
-    GdkPixmap* m_bitmap;
+    wxMask(GdkPixmap*);
     GdkPixmap* GetBitmap() const;
 
 protected:
@@ -38,6 +38,9 @@ protected:
     virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour);
     virtual bool InitFromMonoBitmap(const wxBitmap& bitmap);
 
+private:
+    GdkPixmap* m_bitmap;
+
     DECLARE_DYNAMIC_CLASS(wxMask)
 };
 
@@ -94,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();