X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..e5ee4c908b9dbcf07f0441aa74d8635b7343be4d:/include/wx/motif/choice.h diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h index df445f9e9b..821f16096a 100644 --- a/include/wx/motif/choice.h +++ b/include/wx/motif/choice.h @@ -24,30 +24,30 @@ WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr; class WXDLLEXPORT wxChoice: public wxControlWithItems { DECLARE_DYNAMIC_CLASS(wxChoice) - + public: wxChoice(); ~wxChoice(); - + wxChoice(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr) + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + int n = 0, const wxString choices[] = NULL, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxChoiceNameStr) { Create(parent, id, pos, size, n, choices, style, validator, name); } - + bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr); - + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + int n = 0, const wxString choices[] = NULL, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxChoiceNameStr); + // Virtual functions required by wxControlWithItems. // They are not all implemented yet :-( virtual int GetCount() const; @@ -61,7 +61,7 @@ public: virtual wxClientData* DoGetItemClientObject(int n) const; virtual void Select(int n); virtual void SetString(int n, const wxString& s); - + // Original API virtual void Append(const wxString& item); virtual void Delete(int n); @@ -70,25 +70,25 @@ public: virtual void SetSelection(int n); virtual int FindString(const wxString& s) const; virtual wxString GetString(int n) const ; - + virtual wxString GetStringSelection() const ; virtual bool SetStringSelection(const wxString& sel); - + virtual int Number() const { return m_noStrings; } virtual void Command(wxCommandEvent& event); - + virtual void SetColumns(int n = 1 ); virtual int GetColumns() const ; - + void SetFocus(); - + // Implementation virtual void ChangeFont(bool keepOriginalSize = TRUE); virtual void ChangeBackgroundColour(); virtual void ChangeForegroundColour(); WXWidget GetTopWidget() const { return m_formWidget; } WXWidget GetMainWidget() const { return m_buttonWidget; } - + protected: int m_noStrings; WXWidget m_menuWidget; @@ -97,12 +97,11 @@ protected: WXWidget m_formWidget; wxStringList m_stringList; wxList m_clientList; // contains the client data for the items - - + virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); + int width, int height, + int sizeFlags = wxSIZE_AUTO); }; #endif - // _WX_CHOICE_H_ +// _WX_CHOICE_H_