X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cc1d4ff2a0c78666f35bbfa34fcc609d7862709..9f8845289521c7f53e95b6dfd8275daab8b05639:/include/wx/motif/combobox.h diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h index cbe6c90819..d0b5b2532c 100644 --- a/include/wx/motif/combobox.h +++ b/include/wx/motif/combobox.h @@ -12,7 +12,7 @@ #ifndef _WX_COMBOBOX_H_ #define _WX_COMBOBOX_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "combobox.h" #endif @@ -41,6 +41,20 @@ public: style, validator, name); } + inline wxComboBox(wxWindow *parent, wxWindowID id, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxComboBoxNameStr) + { + m_inSetSelection = false; + Create(parent, id, value, pos, size, choices, + style, validator, name); + } + bool Create(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, @@ -50,6 +64,15 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr); + bool Create(wxWindow *parent, wxWindowID id, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxComboBoxNameStr); + // implementation of wxControlWithItems virtual int DoAppend(const wxString& item); virtual int DoInsert(const wxString& item, int pos);