X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/243dbf1a5088be31980df51b97831b52cb6986cd..c5c5dad5950a43edbb9a4e7144f44b8f3bd6bf80:/include/wx/mac/choice.h diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h index d22ca43d68..ea9756f1a4 100644 --- a/include/wx/mac/choice.h +++ b/include/wx/mac/choice.h @@ -12,7 +12,7 @@ #ifndef _WX_CHOICE_H_ #define _WX_CHOICE_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "choice.h" #endif @@ -68,24 +68,8 @@ public: 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); - - // Mac specific - virtual void Command(wxCommandEvent& event); - void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ; - - virtual inline int GetColumns() const { return 1 ; }; -*/ + void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ; + protected: virtual wxSize DoGetBestSize() const ; virtual void DoSetItemClientData( int n, void* clientData );