X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6762286db6cf974817dead5b88bebf0e390dbb7e..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/osx/combobox.h diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h index 6e0c649aaa..e3c14f8ad0 100644 --- a/include/wx/osx/combobox.h +++ b/include/wx/osx/combobox.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/combobox.h +// Name: wx/osx/combobox.h // Purpose: wxComboBox class // Author: Stefan Csomor // Modified by: @@ -14,31 +14,42 @@ #include "wx/containr.h" #include "wx/choice.h" +#include "wx/textctrl.h" -WXDLLIMPEXP_DATA_CORE(extern const char) wxComboBoxNameStr[]; +WX_DEFINE_ARRAY( char * , wxComboBoxDataArray ) ; // forward declaration of private implementation classes class wxComboBoxText; class wxComboBoxChoice; +class wxComboWidgetImpl; // Combobox item -class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase +class WXDLLIMPEXP_CORE wxComboBox : + public wxWindowWithItems< +#if wxOSX_USE_CARBON + wxNavigationEnabled, +#else + wxControl, +#endif + wxComboBoxBase> { DECLARE_DYNAMIC_CLASS(wxComboBox) public: virtual ~wxComboBox(); +#if wxOSX_USE_CARBON // forward these functions to all subcontrols virtual bool Enable(bool enable = true); virtual bool Show(bool show = true); +#endif // callback functions virtual void DelegateTextChanged( const wxString& value ); virtual void DelegateChoice( const wxString& value ); - wxComboBox() { Init(); } + wxComboBox() { } wxComboBox(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, @@ -49,7 +60,6 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr) { - Init(); Create(parent, id, value, pos, size, n, choices, style, validator, name); } @@ -62,7 +72,6 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr) { - Init(); Create(parent, id, value, pos, size, choices, style, validator, name); } @@ -85,17 +94,22 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase const wxString& name = wxComboBoxNameStr); virtual int GetSelection() const; + virtual void GetSelection(long *from, long *to) const; virtual void SetSelection(int n); + virtual void SetSelection(long from, long to); virtual int FindString(const wxString& s, bool bCase = false) const; virtual wxString GetString(unsigned int n) const; virtual wxString GetStringSelection() const; virtual void SetString(unsigned int n, const wxString& s); - // Text field functions + virtual unsigned int GetCount() const; + virtual void SetValue(const wxString& value); +// these methods are provided by wxTextEntry for the native impl. +#if wxOSX_USE_CARBON + // Text field functions virtual wxString GetValue() const; virtual void WriteText(const wxString& text); - virtual void GetSelection(long *from, long *to) const; // Clipboard operations virtual void Copy(); @@ -107,12 +121,9 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase virtual wxTextPos GetLastPosition() const; virtual void Replace(long from, long to, const wxString& value); virtual void Remove(long from, long to); - virtual void SetSelection(long from, long to); virtual void SetEditable(bool editable); virtual bool IsEditable() const; - virtual unsigned int GetCount() const; - virtual void Undo(); virtual void Redo(); virtual void SelectAll(); @@ -125,25 +136,38 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase virtual wxClientDataType GetClientDataType() const; - // osx specific event handling common for all osx-ports - - virtual bool HandleClicked( double timestampsec ); + virtual wxTextWidgetImpl* GetTextPeer() const; +#endif // wxOSX_USE_CARBON - wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST +#if wxOSX_USE_COCOA + virtual void Popup(); + virtual void Dismiss(); +#endif // wxOSX_USE_COCOA - WX_DECLARE_CONTROL_CONTAINER(); -protected: - // common part of all ctors - void Init(); + // osx specific event handling common for all osx-ports + virtual bool OSXHandleClicked( double timestampsec ); + +#if wxOSX_USE_COCOA + wxComboWidgetImpl* GetComboPeer() const; +#endif +protected: // List functions virtual void DoDeleteOneItem(unsigned int n); virtual void DoClear(); + // wxTextEntry functions +#if wxOSX_USE_CARBON + virtual wxString DoGetValue() const; +#endif + virtual wxWindow *GetEditableWindow() { return this; } + // override the base class virtuals involved in geometry calculations virtual wxSize DoGetBestSize() const; +#if wxOSX_USE_CARBON virtual void DoMoveWindow(int x, int y, int width, int height); +#endif virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, @@ -152,13 +176,17 @@ protected: virtual void DoSetItemClientData(unsigned int n, void* clientData); virtual void * DoGetItemClientData(unsigned int n) const; +#if wxOSX_USE_CARBON virtual void SetClientDataType(wxClientDataType clientDataItemsType); +#endif + + virtual void EnableTextChangedEvents(bool enable); // the subcontrols wxComboBoxText* m_text; wxComboBoxChoice* m_choice; - DECLARE_EVENT_TABLE() + wxComboBoxDataArray m_datas; }; #endif // _WX_COMBOBOX_H_