X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9453cf2bd702241fabc417e9dd5cd7422bcd9966..f148f2bac3fb0fa6d984050fb940112da150aeff:/include/wx/mac/choice.h?ds=sidebyside diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h index 50a506940b..26ac3359c0 100644 --- a/include/wx/mac/choice.h +++ b/include/wx/mac/choice.h @@ -1,37 +1,40 @@ ///////////////////////////////////////////////////////////////////////////// // Name: choice.h // Purpose: wxChoice class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_CHOICE_H_ #define _WX_CHOICE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "choice.h" #endif #include "wx/control.h" - #include + #include "wx/dynarray.h" -WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr; WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ; // Choice item class WXDLLEXPORT wxChoice: public wxChoiceBase { - DECLARE_DYNAMIC_CLASS(wxChoice) + DECLARE_DYNAMIC_CLASS(wxChoice) - public: - wxChoice() {} - virtual ~wxChoice() ; +public: + wxChoice() + : m_strings(), m_datas(), m_macPopUpMenuHandle(NULL) + {} + + virtual ~wxChoice() ; wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -54,6 +57,7 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase // implement base class pure virtuals virtual int DoAppend(const wxString& item); + virtual int DoInsert(const wxString& item, int pos); virtual void Delete(int n); virtual void Clear(); @@ -64,38 +68,26 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase virtual int FindString(const wxString& s) const; virtual wxString GetString(int n) const ; virtual void SetString( int , const wxString& s ) ; - void MacHandleControlClick( ControlHandle control , SInt16 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( ControlHandle control , SInt16 controlpart ) ; - - virtual inline int GetColumns() const { return 1 ; }; -*/ + void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ; + protected: virtual wxSize DoGetBestSize() const ; + +public: // for wxComboBox only 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; +protected: // free all memory we have (used by Clear() and dtor) - void Free(); + // prevent collision with some BSD definitions of macro Free() + void FreeData(); wxArrayString m_strings; wxChoiceDataArray m_datas ; - MenuHandle m_macPopUpMenuHandle ; + WXHMENU m_macPopUpMenuHandle ; }; #endif - // _WX_CHOICE_H_ + // _WX_CHOICE_H_