Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/editlbox.h b/interface/wx/editlbox.h
index 67a6380211a9276354416056ab9cf8bb2f46dbdb..3612e56877501dd6940283a90019c7573b503b8d 100644 (file)
--- a/interface/wx/editlbox.h
+++ b/interface/wx/editlbox.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxEditableListBox
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxEditableListBox
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -51,9 +51,10 @@ public:
             The text shown just before the list control.
         @param pos
             Window position.
             The text shown just before the list control.
         @param pos
             Window position.

+            If ::wxDefaultPosition is specified then a default position is chosen.

         @param size
         @param size

-            Window size. If wxDefaultSize is specified then the window is sized
-            appropriately.
+            Window size. 
+            If ::wxDefaultSize is specified then the window is sized appropriately.

         @param style
             Window style. See wxEditableListBox.
         @param name
         @param style
             Window style. See wxEditableListBox.
         @param name


@@ -66,23 +67,22 @@ public:
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = wxEL_DEFAULT_STYLE,
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = wxEL_DEFAULT_STYLE,

-                      const wxString& name = "editableListBox");
+                      const wxString& name = wxEditableListBoxNameStr);

 
     /**
         Destructor, destroying the list box.
     */
 
     /**
         Destructor, destroying the list box.
     */

-    ~wxEditableListBox();
+    virtual ~wxEditableListBox();

 
     /**
         Creates the editable listbox for two-step construction.
         See wxEditableListBox() for further details.
     */
 
     /**
         Creates the editable listbox for two-step construction.
         See wxEditableListBox() for further details.
     */

-    bool Create(wxWindow* parent, wxWindowID id,
-                const wxString& label,
+    bool Create(wxWindow* parent, wxWindowID id, const wxString& label,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxEL_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxEL_DEFAULT_STYLE,

-                const wxString& name = "editableListBox");
+                const wxString& name = wxEditableListBoxNameStr);

 
     /**
         Replaces current contents with given strings.
 
     /**
         Replaces current contents with given strings.


@@ -94,6 +94,6 @@ public:
         Returns in the given array the current contents of the control
         (the array will be erased before control's contents are appended).
     */
         Returns in the given array the current contents of the control
         (the array will be erased before control's contents are appended).
     */

-    void GetSelections(wxArrayString& strings) const;
+    void GetStrings(wxArrayString& strings) const;

 };
 
 };