X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/336a6aba60f239bfc33650ffe97702494940a4f6..8850cbd3c3f4e714e6883d3ff8e4ac58144427bc:/include/wx/mac/carbon/combobox.h diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h index 8acef5176c..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,7 +116,7 @@ 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() ; } + 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