Instead of just deleting m_popupInterface, call Destroy() of its wxWindow-based popup...

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

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 31704b746c943d1e04ffad6c91a5e672212742cf..70e93fd534231e47c14071fa2c7a55ab8b14a95d 100644 (file)
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -17,6 +17,8 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
 // wxChoice
 //-----------------------------------------------------------------------------
 
 // wxChoice
 //-----------------------------------------------------------------------------
 

+class wxGtkCollatedArrayString;
+

 class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase
 {
 public:
 class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase
 {
 public:


@@ -75,8 +77,8 @@ public:
     virtual void SetColumns(int n=1);
     virtual int GetColumns() const;
 
     virtual void SetColumns(int n=1);
     virtual int GetColumns() const;
 

-    virtual void DisableEvents();
-    virtual void EnableEvents();
+    virtual void GTKDisableEvents();
+    virtual void GTKEnableEvents();

 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);


@@ -84,7 +86,7 @@ public:
 protected:
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)
 protected:
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)

-    wxSortedArrayString *m_strings;
+    wxGtkCollatedArrayString *m_strings;

 
     // contains the client data for the items
     wxArrayPtrVoid m_clientData;
 
     // contains the client data for the items
     wxArrayPtrVoid m_clientData;