X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cf73271dd6f442a98e86b559d4a55c37e25b99f..8c985698885689f9e60b0d03f469e3a566fc7410:/include/wx/mac/carbon/combobox.h diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h index 68b3b02820..774d7a13f4 100644 --- a/include/wx/mac/carbon/combobox.h +++ b/include/wx/mac/carbon/combobox.h @@ -21,6 +21,11 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr; +// forward declaration of private implementation classes + +class wxComboBoxText ; +class wxComboBoxChoice ; + // Combobox item class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase { @@ -111,8 +116,8 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase virtual void Remove(long from, long to); virtual void SetSelection(long from, long to); virtual void SetEditable(bool editable); - virtual int GetCount() const { return m_choice->GetCount() ; } - void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ; + virtual int GetCount() const ; + wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ; wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST @@ -128,8 +133,8 @@ protected: void FreeData(); // the subcontrols - wxTextCtrl* m_text; - wxChoice* m_choice; + wxComboBoxText* m_text; + wxComboBoxChoice* m_choice; }; #endif