Wrap wxImage specifics in wxUSE_IMAGE and wxBitmap specifics in wxUSE_GUI.

[wxWidgets.git] / include / wx / gtk1 / choice.h

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index d738e3e253e614adda99eb9af47a8509fc5d0287..70fea3819b4b8ff6a5081386a8f94f12d6ee9fe5 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -77,10 +77,13 @@ public:
     wxString GetString( int n ) const;
     void SetString( int n, const wxString& string );
 
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
 protected:
     wxList m_clientList;    // contains the client data for the items
 
-    void ApplyWidgetStyle();
+    void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual int DoAppend(const wxString& item);
     virtual int DoInsert(const wxString& item, int pos);
 
@@ -92,6 +95,7 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
     virtual bool IsOwnGtkWindow( GdkWindow *window );
+
 private:
     // common part of Create() and DoAppend()
     int GtkAddHelper(GtkWidget *menu, int pos, const wxString& item);
@@ -100,6 +104,10 @@ private:
     // allocate it if it's needed (hence using pointer)
     wxSortedArrayString *m_strings;
 
+    // this circumvents a GTK+ 2.0 bug so that the selection is 
+    // invalidated properly 
+    int m_selection_hack;
+    
     DECLARE_DYNAMIC_CLASS(wxChoice)
 };