typo fix in Restore(): __GTK20__ -> __WXGTK20__ (patch 984852)

[wxWidgets.git] / src / univ / combobox.cpp

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 4248176caaa788cb021771d478424cd2a6a929e8..494df2c0b84adea6972f7cd88dad4777e84a09c8 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "univcombobox.h"
 #endif
 
     #pragma implementation "univcombobox.h"
 #endif
 


@@ -93,7 +93,7 @@ public:
     }
 
 protected:
     }
 
 protected:

-    void OnButton(wxCommandEvent& event) { m_combo->ShowPopup(); }
+    void OnButton(wxCommandEvent& WXUNUSED(event)) { m_combo->ShowPopup(); }

 
     virtual wxSize DoGetBestClientSize() const
     {
 
     virtual wxSize DoGetBestClientSize() const
     {


@@ -123,6 +123,8 @@ public:
 
     // implement wxComboPopup methods
     virtual bool SetSelection(const wxString& value);
 
     // implement wxComboPopup methods
     virtual bool SetSelection(const wxString& value);

+    virtual void SetSelection(int n, bool select)
+        { wxListBox::SetSelection( n, select); };

     virtual wxControl *GetControl() { return this; }
     virtual void OnShow();
     virtual wxCoord GetBestWidth() const;
     virtual wxControl *GetControl() { return this; }
     virtual void OnShow();
     virtual wxCoord GetBestWidth() const;


@@ -278,7 +280,7 @@ wxComboControl::~wxComboControl()
 {
     // as the button and the text control are the parent's children and not
     // ours, we have to delete them manually - they are not deleted
 {
     // as the button and the text control are the parent's children and not
     // ours, we have to delete them manually - they are not deleted

-    // automatically by wxWindows when we're deleted
+    // automatically by wxWidgets when we're deleted

     delete m_btn;
     delete m_text;
 
     delete m_btn;
     delete m_text;
 


@@ -290,7 +292,7 @@ wxComboControl::~wxComboControl()
 // ----------------------------------------------------------------------------
 
 void wxComboControl::DoSetSize(int x, int y,
 // ----------------------------------------------------------------------------
 
 void wxComboControl::DoSetSize(int x, int y,

-                               int width, int height,
+                               int width, int WXUNUSED(height),

                                int sizeFlags)
 {
     // combo height is always fixed
                                int sizeFlags)
 {
     // combo height is always fixed


@@ -655,13 +657,44 @@ void wxComboBox::Init()
     m_lbox = (wxListBox *)NULL;
 }
 
     m_lbox = (wxListBox *)NULL;
 }
 

+wxComboBox::wxComboBox(wxWindow *parent,
+                       wxWindowID id,
+                       const wxString& value,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       const wxArrayString& choices,
+                       long style,
+                       const wxValidator& validator,
+                       const wxString& name)
+{
+    Init();
+
+    Create(parent, id, value, pos, size, choices, style, validator, name);
+}
+
+bool wxComboBox::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxString& value,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        const wxArrayString& choices,
+                        long style,
+                        const wxValidator& validator,
+                        const wxString& name)
+{
+    wxCArrayString chs(choices);
+
+    return Create(parent, id, value, pos, size, chs.GetCount(),
+                  chs.GetStrings(), style, validator, name);
+}
+

 bool wxComboBox::Create(wxWindow *parent,
                         wxWindowID id,
                         const wxString& value,
                         const wxPoint& pos,
                         const wxSize& size,
                         int n,
 bool wxComboBox::Create(wxWindow *parent,
                         wxWindowID id,
                         const wxString& value,
                         const wxPoint& pos,
                         const wxSize& size,
                         int n,

-                        const wxString *choices,
+                        const wxString choices[],

                         long style,
                         const wxValidator& validator,
                         const wxString& name)
                         long style,
                         const wxValidator& validator,
                         const wxString& name)


@@ -833,7 +866,7 @@ int wxComboBox::DoInsert(const wxString& item, int pos)
     if (pos == GetCount())
         return DoAppend(item);
 
     if (pos == GetCount())
         return DoAppend(item);
 

-    GetLBox()->Insert(1, &item, pos);
+    GetLBox()->Insert(item, pos);

     return pos;
 }
 
     return pos;
 }