X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f38374d0d7aa865e9bbe8ee61b75b94ffcdfb220..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/os2/combobox.h diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h index 1b8b532805..1d008aa644 100644 --- a/include/wx/os2/combobox.h +++ b/include/wx/os2/combobox.h @@ -16,68 +16,125 @@ #if wxUSE_COMBOBOX -WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr; -WXDLLEXPORT_DATA(extern const char*) wxEmptyString; - // Combobox item -class WXDLLEXPORT wxComboBox: public wxChoice +class WXDLLEXPORT wxComboBox : public wxChoice { - DECLARE_DYNAMIC_CLASS(wxComboBox) public: inline wxComboBox() {} - inline wxComboBox(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, -#if wxUSE_VALIDATORS - const wxValidator& validator = wxDefaultValidator, -#endif - const wxString& name = wxComboBoxNameStr) - { - Create(parent, id, value, pos, size, n, choices, style, validator, name); - } + inline wxComboBox( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsValue = wxEmptyString + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,int n = 0 + ,const wxString asChoices[] = NULL + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxComboBoxNameStr + ) + { + Create( pParent + ,vId + ,rsValue + ,rPos + ,rSize + ,n + ,asChoices + ,lStyle + ,rValidator + ,rsName + ); + } - bool Create(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, -#if wxUSE_VALIDATORS - const wxValidator& validator = wxDefaultValidator, -#endif - const wxString& name = wxComboBoxNameStr); + inline wxComboBox( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsValue + ,const wxPoint& rPos + ,const wxSize& rSize + ,const wxArrayString& asChoices + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxComboBoxNameStr + ) + { + Create( pParent + ,vId + ,rsValue + ,rPos + ,rSize + ,asChoices + ,lStyle + ,rValidator + ,rsName + ); + } - // List functions: see wxChoice + bool Create( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsValue = wxEmptyString + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,int n = 0 + ,const wxString asChoices[] = NULL + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxComboBoxNameStr + ); - wxString GetValue() const { return GetLabel(); } - virtual void SetValue(const wxString& value); + bool Create( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsValue + ,const wxPoint& rPos + ,const wxSize& rSize + ,const wxArrayString& asChoices + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxComboBoxNameStr + ); + // + // List functions: see wxChoice + // + virtual wxString GetValue(void) const; + virtual void SetValue(const wxString& rsValue); + + // // Clipboard operations + // virtual void Copy(); virtual void Cut(); virtual void Paste(); - virtual void SetInsertionPoint(long pos); - virtual void SetInsertionPointEnd(); - virtual long GetInsertionPoint() const; - virtual long GetLastPosition() const; - virtual void Replace(long from, long to, const wxString& value); - virtual void Remove(long from, long to); - virtual void SetSelection(int n) { wxChoice::SetSelection(n); } - virtual void SetSelection(long from, long to); - virtual void SetEditable(bool editable); - virtual bool OS2Command(WXUINT param, WXWORD id); + virtual void SetInsertionPoint(long lPos); + virtual void SetInsertionPointEnd(void); + virtual long GetInsertionPoint(void) const; + virtual wxTextPos GetLastPosition(void) const; + virtual void Replace( long lFrom + ,long lTo + ,const wxString& rsValue + ); + virtual void Remove( long lFrom + ,long lTo + ); + inline virtual void SetSelection(int n) { wxChoice::SetSelection(n); } + virtual void SetSelection( long lFrom + ,long lTo + ); + virtual void SetEditable(bool bEditable); + + virtual bool OS2Command( WXUINT uParam + ,WXWORD wId + ); + bool ProcessEditMsg( WXUINT uMsg + ,WXWPARAM wParam + ,WXLPARAM lParam + ); -protected: - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); -}; +private: + DECLARE_DYNAMIC_CLASS(wxComboBox) +}; // end of CLASS wxComboBox #endif // wxUSE_COMBOBOX #endif