X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0dbd6262a9ee7d735fb3930707346298f71b2cb7..6ba7c06eeeda47b88783025428ca0f290e3bf236:/include/wx/mac/choice.h?ds=sidebyside diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h index 7f360ed5cc..a122f95f37 100644 --- a/include/wx/mac/choice.h +++ b/include/wx/mac/choice.h @@ -12,23 +12,31 @@ #ifndef _WX_CHOICE_H_ #define _WX_CHOICE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "choice.h" #endif #include "wx/control.h" + #include "wx/dynarray.h" + WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr; +WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ; + // Choice item -class WXDLLEXPORT wxChoice: public wxControl +class WXDLLEXPORT wxChoice: public wxChoiceBase { - DECLARE_DYNAMIC_CLASS(wxChoice) + DECLARE_DYNAMIC_CLASS(wxChoice) - public: - inline wxChoice() { m_noStrings = 0; } +public: + wxChoice() + : m_strings(), m_datas(), m_macPopUpMenuHandle(NULL) + {} + + virtual ~wxChoice() ; - inline wxChoice(wxWindow *parent, wxWindowID id, + wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, @@ -47,25 +55,50 @@ class WXDLLEXPORT wxChoice: public wxControl const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr); - virtual void Append(const wxString& item); + // implement base class pure virtuals + virtual int DoAppend(const wxString& item); virtual void Delete(int n); virtual void Clear(); + + virtual int GetCount() const ; virtual int GetSelection() const ; virtual void SetSelection(int n); + virtual int FindString(const wxString& s) const; virtual wxString GetString(int n) const ; + virtual void SetString( int , const wxString& s ) ; + void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ; + +/* + virtual void Append(const wxString& item); + // Added min Append and GetClientData + virtual void Append(const wxString& item, void *client_data); + virtual void *GetClientData(int index) const; + virtual inline void Select( int n ) { SetSelection( n ); } virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); virtual wxString GetStringSelection() const ; virtual bool SetStringSelection(const wxString& sel); - virtual inline int Number() const { return m_noStrings; } + // Mac specific virtual void Command(wxCommandEvent& event); + void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ; - virtual inline void SetColumns(int WXUNUSED(n) = 1 ) { /* No effect */ } ; virtual inline int GetColumns() const { return 1 ; }; - +*/ protected: - int m_noStrings; + virtual wxSize DoGetBestSize() const ; + virtual void DoSetItemClientData( int n, void* clientData ); + virtual void* DoGetItemClientData( int n ) const; + virtual void DoSetItemClientObject( int n, wxClientData* clientData ); + virtual wxClientData* DoGetItemClientObject( int n ) const; + + // free all memory we have (used by Clear() and dtor) + // prevent collision with some BSD definitions of macro Free() + void FreeData(); + + wxArrayString m_strings; + wxChoiceDataArray m_datas ; + WXHMENU m_macPopUpMenuHandle ; }; #endif