Use the correct WXDLLEXPORT declaration.

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

diff --git a/include/wx/univ/checklst.h b/include/wx/univ/checklst.h
index 7d7da30cc109ff230d0e2114ddd5919293883987..44233e09efe00bb90e94ce5e32ebf28bc9ccf8b8 100644 (file)
--- a/include/wx/univ/checklst.h
+++ b/include/wx/univ/checklst.h
@@ -30,14 +30,27 @@ class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase
 {
 public:
     // ctors
 {
 public:
     // ctors

-    wxCheckListBox();
+    wxCheckListBox() { Init(); }

 
     wxCheckListBox(wxWindow *parent,
                    wxWindowID id,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    int nStrings = 0,
 
     wxCheckListBox(wxWindow *parent,
                    wxWindowID id,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    int nStrings = 0,

-                   const wxString *choices = NULL,
+                   const wxString choices[] = NULL,
+                   long style = 0,
+                   const wxValidator& validator = wxDefaultValidator,
+                   const wxString& name = wxListBoxNameStr)
+    {
+        Init();
+
+        Create(parent, id, pos, size, nStrings, choices, style, validator, name);
+    }
+    wxCheckListBox(wxWindow *parent,
+                   wxWindowID id,
+                   const wxPoint& pos,
+                   const wxSize& size,
+                   const wxArrayString& choices,

                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxListBoxNameStr);
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxListBoxNameStr);


@@ -47,14 +60,22 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 int nStrings = 0,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 int nStrings = 0,

-                const wxString *choices = NULL,
+                const wxString choices[] = (const wxString *) NULL,
+                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 check list box methods
     virtual bool IsChecked(size_t item) const;
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);
 
     // implement check list box methods
     virtual bool IsChecked(size_t item) const;

-    virtual void Check(size_t item, bool check = TRUE);
+    virtual void Check(size_t item, bool check = true);

 
     // and input handling
     virtual bool PerformAction(const wxControlAction& action,
 
     // and input handling
     virtual bool PerformAction(const wxControlAction& action,