X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/motif/choice.h?ds=sidebyside diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h index b5a2f3c1a0..bc8f39cf7d 100644 --- a/include/wx/motif/choice.h +++ b/include/wx/motif/choice.h @@ -1,25 +1,25 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: choice.h +// Name: wx/motif/choice.h // Purpose: wxChoice class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_CHOICE_H_ #define _WX_CHOICE_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "choice.h" -#endif - #include "wx/clntdata.h" -#include "wx/dynarray.h" -WX_DEFINE_ARRAY(WXWidget, wxWidgetArray); +#ifndef wxWIDGET_ARRAY_DEFINED + #define wxWIDGET_ARRAY_DEFINED + + #include "wx/dynarray.h" + WX_DEFINE_ARRAY_PTR(WXWidget, wxWidgetArray); +#endif // Choice item class WXDLLEXPORT wxChoice: public wxChoiceBase @@ -28,8 +28,8 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase public: wxChoice(); - ~wxChoice(); - + virtual ~wxChoice(); + wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -41,7 +41,19 @@ public: Init(); Create(parent, id, pos, size, n, choices, style, validator, name); } - + + wxChoice(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxChoiceNameStr) + { + Init(); + Create(parent, id, pos, size, choices, style, validator, name); + } + bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -50,33 +62,40 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr); + bool Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxChoiceNameStr); + // implementation of wxControlWithItems - virtual int GetCount() const; + virtual unsigned int GetCount() const; virtual int DoAppend(const wxString& item); - virtual int DoInsert(const wxString& item, int pos); - 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; + virtual int DoInsert(const wxString& item, unsigned int pos); + virtual void DoSetItemClientData(unsigned int n, void* clientData); + virtual void* DoGetItemClientData(unsigned int n) const; + virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData); + virtual wxClientData* DoGetItemClientObject(unsigned int n) const; virtual int GetSelection() const; - virtual void Delete(int n); - virtual int FindString(const wxString& s) const; + virtual void Delete(unsigned int n); virtual void Clear(); - virtual void SetString(int n, const wxString& s); - virtual wxString GetString(int n) const; + virtual void SetString(unsigned int n, const wxString& s); + virtual wxString GetString(unsigned int n) const; // implementation of wxChoiceBase virtual void SetSelection(int n); virtual void SetColumns(int n = 1 ); virtual int GetColumns() const ; - - // Original API + + // Original API virtual void Command(wxCommandEvent& event); - + void SetFocus(); - + // Implementation - virtual void ChangeFont(bool keepOriginalSize = TRUE); + virtual void ChangeFont(bool keepOriginalSize = true); virtual void ChangeBackgroundColour(); virtual void ChangeForegroundColour(); WXWidget GetTopWidget() const { return m_formWidget; } @@ -93,14 +112,14 @@ protected: // common part of all contructors void Init(); - size_t m_noStrings; + unsigned int m_noStrings; WXWidget m_menuWidget; WXWidget m_buttonWidget; wxWidgetArray m_widgetArray; WXWidget m_formWidget; wxStringList m_stringList; wxClientDataDictionary m_clientDataDict; - + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);