fixed warnings after GetFont prototype change

[wxWidgets.git] / include / wx / univ / listbox.h

diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h
index 07bbd27a55ec83c2a41415e446ee7a7677abee0b..acc660541a78e5bb164c4250631a3d5e37c64b94 100644 (file)
--- a/include/wx/univ/listbox.h
+++ b/include/wx/univ/listbox.h
@@ -70,6 +70,14 @@ public:
 
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
+    wxListBox(wxWindow *parent,
+              wxWindowID id,
+              const wxPoint& pos,
+              const wxSize& size,
+              const wxArrayString& choices,
+              long style = 0,
+              const wxValidator& validator = wxDefaultValidator,
+              const wxString& name = wxListBoxNameStr );
 
     virtual ~wxListBox();
 
@@ -81,6 +89,14 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxListBoxNameStr);
 
     // implement the listbox interface defined by wxListBoxBase
     virtual void Clear();
@@ -167,11 +183,9 @@ public:
                                long numArg = 0l,
                                const wxString& strArg = wxEmptyString);
 
-    // let wxColourScheme choose the right colours for us
-    virtual bool IsContainerWindow() const { return TRUE; }
-
     // idle processing
     virtual void OnInternalIdle();
+
 protected:
     // geometry
     virtual wxSize DoGetBestClientSize() const;