X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12f5e1e78fe906050ff2fee9529476db332633f0..6b03a638a437316e47f02a896d3ad664d59c6ddb:/interface/wx/bmpcbox.h diff --git a/interface/wx/bmpcbox.h b/interface/wx/bmpcbox.h index af60247aa8..c5ba7aa7ff 100644 --- a/interface/wx/bmpcbox.h +++ b/interface/wx/bmpcbox.h @@ -77,15 +77,15 @@ public: @see Create(), wxValidator */ - wxBitmapComboBox(wxWindow* parent, wxWindowID id, - const wxString& value = "", + wxBitmapComboBox(wxWindow* parent, wxWindowID id = wxID_ANY, + const wxString& value = wxEmptyString, 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 = "comboBox"); + const wxString& name = wxBitmapComboBoxNameStr); /** Constructor, creating and showing a combobox. @@ -106,9 +106,9 @@ public: const wxPoint& pos, const wxSize& size, const wxArrayString& choices, - long style = 0, + long style, const wxValidator& validator = wxDefaultValidator, - const wxString& name = "comboBox"); + const wxString& name = wxBitmapComboBoxNameStr); /** Destructor, destroying the combobox. @@ -139,13 +139,13 @@ public: Creates the combobox for two-step construction. */ bool Create(wxWindow* parent, wxWindowID id, - const wxString& value = "", - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, + const wxString& value, + const wxPoint& pos, + const wxSize& size, int n, const wxString choices[], long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = "comboBox"); + const wxString& name = wxBitmapComboBoxNameStr); /** Creates the combobox for two-step construction. @@ -157,7 +157,7 @@ public: const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = "comboBox"); + const wxString& name = wxBitmapComboBoxNameStr); /** Returns size of bitmaps used in the list.