Warning fixes after char->wxChar in wxVariant.

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

diff --git a/include/wx/univ/checklst.h b/include/wx/univ/checklst.h
index 6382c16363e4ee47eab147de8e5342f205611b2d..e6afd10a16e3894176837433133f09ea767e01a2 100644 (file)
--- a/include/wx/univ/checklst.h
+++ b/include/wx/univ/checklst.h
@@ -12,10 +12,6 @@
 #ifndef _WX_UNIV_CHECKLST_H_
 #define _WX_UNIV_CHECKLST_H_
 
 #ifndef _WX_UNIV_CHECKLST_H_
 #define _WX_UNIV_CHECKLST_H_
 

-#ifdef __GNUG__
-    #pragma interface "univchecklst.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // actions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // actions
 // ----------------------------------------------------------------------------


@@ -37,7 +33,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,33 +42,55 @@ 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
                 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 bool IsChecked(unsigned int item) const;
+    virtual void Check(unsigned int item, bool check = true);

 
     // and input handling
     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = -1l,
                                const wxString& strArg = wxEmptyString);
 
 
     // and input handling
     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = -1l,
                                const wxString& strArg = wxEmptyString);
 

+    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
+    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
+    {
+        return GetStdInputHandler(handlerDef);
+    }
+

     // override all methods which add/delete items to update m_checks array as
     // well
     // override all methods which add/delete items to update m_checks array as
     // well

-    virtual void Delete(int n);
+    virtual void Delete(unsigned int n);

 
 protected:
     virtual int DoAppend(const wxString& item);
 
 protected:
     virtual int DoAppend(const wxString& item);

-    virtual void DoInsertItems(const wxArrayString& items, int pos);
+    virtual void DoInsertItems(const wxArrayString& items, unsigned int pos);

     virtual void DoSetItems(const wxArrayString& items, void **clientData);
     virtual void DoClear();
 
     virtual void DoSetItems(const wxArrayString& items, void **clientData);
     virtual void DoClear();
 


@@ -93,21 +111,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 };
 
     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 };
 

-// ----------------------------------------------------------------------------
-// wxStdCheckListBoxInputHandler
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxStdCheckListboxInputHandler : public wxStdListboxInputHandler
-{
-public:
-    wxStdCheckListboxInputHandler(wxInputHandler *inphand);
-
-    virtual bool HandleKey(wxInputConsumer *consumer,
-                           const wxKeyEvent& event,
-                           bool pressed);
-    virtual bool HandleMouse(wxInputConsumer *consumer,
-                             const wxMouseEvent& event);
-};
-

 #endif // _WX_UNIV_CHECKLST_H_
 #endif // _WX_UNIV_CHECKLST_H_

-