Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 31704b746c943d1e04ffad6c91a5e672212742cf..eb1fe8989bd44c423016ee6d30f1ef6cff3e8ed9 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:


@@ -62,8 +64,6 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr );
 
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr );
 

-    void SendSelectionChangedEvent(wxEventType evt_type);
-

     int GetSelection() const;
     void SetSelection(int n);
 
     int GetSelection() const;
     void SetSelection(int n);
 


@@ -75,8 +75,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 +84,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;


@@ -93,6 +93,7 @@ protected:
     int m_stringCellIndex;
 
     virtual wxSize DoGetBestSize() const;
     int m_stringCellIndex;
 
     virtual wxSize DoGetBestSize() const;

+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;

     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
                               void **clientData, wxClientDataType type);
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
                               void **clientData, wxClientDataType type);