fix default argument values

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/interface/wx/bmpcbox.h b/interface/wx/bmpcbox.h
index 897261d01d7b2de443f530c0e7728faa6a4bd8d3..c5ba7aa7ff832a321646232bfe6d1923c18a31e8 100644 (file)
--- a/interface/wx/bmpcbox.h
+++ b/interface/wx/bmpcbox.h
@@ -77,15 +77,15 @@ public:
 
         @see Create(), wxValidator
     */
 
         @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 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.
 
     /**
         Constructor, creating and showing a combobox.


@@ -106,9 +106,9 @@ public:
                      const wxPoint& pos,
                      const wxSize& size,
                      const wxArrayString& choices,
                      const wxPoint& pos,
                      const wxSize& size,
                      const wxArrayString& choices,

-                     long style = 0,
+                     long style,

                      const wxValidator& validator = wxDefaultValidator,
                      const wxValidator& validator = wxDefaultValidator,

-                     const wxString& name = "comboBox");
+                     const wxString& name = wxBitmapComboBoxNameStr);

 
     /**
         Destructor, destroying the combobox.
 
     /**
         Destructor, destroying the combobox.


@@ -145,7 +145,7 @@ public:
                 int n, const wxString choices[],
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 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.
 
     /**
         Creates the combobox for two-step construction.


@@ -157,7 +157,7 @@ public:
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 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.
 
     /**
         Returns size of bitmaps used in the list.