another AIX compilation fix: getservbyname_r() returns int, not servent* there

[wxWidgets.git] / interface / wx / combobox.h

diff --git a/interface/wx/combobox.h b/interface/wx/combobox.h
index a13a5838e0a6b130cb961fa4efa4b3f97ce290f1..2054fbd949aec4771fb0407626410aa3d9df529d 100644 (file)
--- a/interface/wx/combobox.h
+++ b/interface/wx/combobox.h
@@ -37,7 +37,7 @@
            only.
     @endStyleTable
 
-    @beginEventTable{wxCommandEvent}
+    @beginEventEmissionTable{wxCommandEvent}
     @event{EVT_COMBOBOX(id, func)}
            Process a wxEVT_COMMAND_COMBOBOX_SELECTED event, when an item on
            the list is selected. Note that calling GetValue() returns the new
@@ -99,14 +99,14 @@ public:
         @see Create(), wxValidator
     */
     wxComboBox(wxWindow* parent, wxWindowID id,
-               const wxString& value = "",
+               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 = wxComboBoxNameStr);
     /**
         Constructor, creating and showing a combobox.
 
@@ -144,7 +144,7 @@ public:
                const wxArrayString& choices,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = "comboBox");
+               const wxString& name = wxComboBoxNameStr);
     //@}
 
     /**
@@ -157,22 +157,22 @@ public:
         Creates the combobox for two-step construction. Derived classes should
         call or replace this function. See wxComboBox() for further details.
     */
-    bool Create(wxWindow* parent, wxWindowID id,
-                const wxString& value = "",
+    bool Create(wxWindow *parent, wxWindowID id,
+                const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                int n, const wxString choices[],
+                int n = 0, const wxString choices[] = (const wxString *) NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = "comboBox");
-    bool Create(wxWindow* parent, wxWindowID id,
+                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 = "comboBox");
+                const wxString& name = wxComboBoxNameStr);
     //@}
 
     /**
@@ -234,7 +234,7 @@ public:
     /**
         Returns the last position in the combobox text field.
     */
-    virtual wxTextPos GetLastPosition() const;
+    virtual long GetLastPosition() const;
 
     /**
         This is the same as wxTextCtrl::GetSelection() for the text control