Native spline drawing.

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

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 17ae9edeb229e2e666aa8fdddb7a96d6014656d4..f3c28565c94b1b2b8e503d5e929e2dc7638dd43d 100644 (file)
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -21,7 +21,7 @@ class WXDLLIMPEXP_BASE wxArrayString;
 // wxChoice
 //-----------------------------------------------------------------------------
 
 // wxChoice
 //-----------------------------------------------------------------------------
 

-class wxChoice : public wxChoiceBase
+class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase

 {
 public:
     wxChoice();
 {
 public:
     wxChoice();


@@ -70,6 +70,9 @@ public:
     void Clear();
 
     int GetSelection() const;
     void Clear();
 
     int GetSelection() const;

+#if wxABI_VERSION >= 20602
+    int GetCurrentSelection() const { return GetSelection(); }
+#endif

     void SetSelection( int n );
 
     virtual int GetCount() const;
     void SetSelection( int n );
 
     virtual int GetCount() const;


@@ -83,7 +86,7 @@ public:
 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);
 


@@ -104,6 +107,12 @@ private:
     // allocate it if it's needed (hence using pointer)
     wxSortedArrayString *m_strings;
 
     // allocate it if it's needed (hence using pointer)
     wxSortedArrayString *m_strings;
 

+public:
+    // this circumvents a GTK+ 2.0 bug so that the selection is 
+    // invalidated properly 
+    int m_selection_hack;
+
+private:

     DECLARE_DYNAMIC_CLASS(wxChoice)
 };
 
     DECLARE_DYNAMIC_CLASS(wxChoice)
 };