update from Michalis Kabrianis (patch 1145218)

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

diff --git a/include/wx/univ/checklst.h b/include/wx/univ/checklst.h
index 7c8b261ac4d6673160dc6eae4c34a991d0852ee0..44233e09efe00bb90e94ce5e32ebf28bc9ccf8b8 100644 (file)
--- a/include/wx/univ/checklst.h
+++ b/include/wx/univ/checklst.h
@@ -12,7 +12,7 @@
 #ifndef _WX_UNIV_CHECKLST_H_
 #define _WX_UNIV_CHECKLST_H_
 
 #ifndef _WX_UNIV_CHECKLST_H_
 #define _WX_UNIV_CHECKLST_H_
 

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

     #pragma interface "univchecklst.h"
 #endif
 
     #pragma interface "univchecklst.h"
 #endif
 


@@ -37,7 +37,7 @@ 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[] = NULL,

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


@@ -46,20 +46,36 @@ public:
 
         Create(parent, id, pos, size, nStrings, choices, style, validator, name);
     }
 
         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);

 
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 int nStrings = 0,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 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,


@@ -102,10 +118,10 @@ class WXDLLEXPORT wxStdCheckListboxInputHandler : public wxStdListboxInputHandle
 public:
     wxStdCheckListboxInputHandler(wxInputHandler *inphand);
 
 public:
     wxStdCheckListboxInputHandler(wxInputHandler *inphand);
 

-    virtual bool HandleKey(wxControl *control,
+    virtual bool HandleKey(wxInputConsumer *consumer,

                            const wxKeyEvent& event,
                            bool pressed);
                            const wxKeyEvent& event,
                            bool pressed);

-    virtual bool HandleMouse(wxControl *control,
+    virtual bool HandleMouse(wxInputConsumer *consumer,

                              const wxMouseEvent& event);
 };
 
                              const wxMouseEvent& event);
 };