Deprecated SetItemImage with 2 image ids

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

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index d738e3e253e614adda99eb9af47a8509fc5d0287..8732297d191c78eaee4d0431f9ac841f75806e73 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 );
 
     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
 
 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);
 
     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 );
     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);
 private:
     // common part of Create() and DoAppend()
     int GtkAddHelper(GtkWidget *menu, int pos, const wxString& item);