Tinderbox build fix for wxUnivGTK build.

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

diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h
index 7804a966254e7a39ae6fb3ea66e3e41e26635e24..00adce243d8f0a4ee89711a59656b51df184c8e6 100644 (file)
--- a/include/wx/gtk/listbox.h
+++ b/include/wx/gtk/listbox.h
@@ -18,7 +18,10 @@ class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase
 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

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

     wxListBox( wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
     wxListBox( wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,


@@ -27,9 +30,7 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr )
     {
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr )
     {

-#if wxUSE_CHECKLISTBOX
-        m_hasCheckBoxes = FALSE;
-#endif // wxUSE_CHECKLISTBOX
+        Init();

         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
     wxListBox( wxWindow *parent, wxWindowID id,
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
     wxListBox( wxWindow *parent, wxWindowID id,


@@ -40,9 +41,7 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr )
     {
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr )
     {

-#if wxUSE_CHECKLISTBOX
-        m_hasCheckBoxes = FALSE;
-#endif // wxUSE_CHECKLISTBOX
+        Init();

         Create(parent, id, pos, size, choices, style, validator, name);
     }
     virtual ~wxListBox();
         Create(parent, id, pos, size, choices, style, validator, name);
     }
     virtual ~wxListBox();


@@ -64,11 +63,11 @@ public:
 
     // implement base class pure virtuals
     virtual void Clear();
 
     // implement base class pure virtuals
     virtual void Clear();

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

 
 

-    virtual int GetCount() const;
-    virtual wxString GetString(int n) const;
-    virtual void SetString(int n, const wxString& s);
+    virtual unsigned int GetCount() const;
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& s);

     virtual int FindString(const wxString& s, bool bCase = false) const;
 
     virtual bool IsSelected(int n) const;
     virtual int FindString(const wxString& s, bool bCase = false) const;
 
     virtual bool IsSelected(int n) const;


@@ -99,26 +98,28 @@ public:
     bool       m_spacePressed;
 
     struct _GtkTreeEntry* GtkGetEntry(int pos) const;
     bool       m_spacePressed;
 
     struct _GtkTreeEntry* GtkGetEntry(int pos) const;

-    void GtkInsertItems(const wxArrayString& items, 
-                        void** clientData, int pos);
+    void GtkInsertItems(const wxArrayString& items,
+                        void** clientData, unsigned int pos);

     void GtkSetSelection(int n, const bool select, const bool blockEvent);
 
 protected:
     virtual wxSize DoGetBestSize() const;
     virtual void DoSetSelection(int n, bool select);
     virtual int DoAppend(const wxString& item);
     void GtkSetSelection(int n, const bool select, const bool blockEvent);
 
 protected:
     virtual wxSize DoGetBestSize() const;
     virtual void DoSetSelection(int n, bool select);
     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 DoSetFirstItem(int n);
     virtual void DoSetItems(const wxArrayString& items, void **clientData);
     virtual void DoSetFirstItem(int n);

-    virtual void DoSetItemClientData(int n, void* clientData);
-    virtual void* DoGetItemClientData(int n) const;
-    virtual void DoSetItemClientObject(int n, wxClientData* clientData);
-    virtual wxClientData* DoGetItemClientObject(int n) const;
+    virtual void DoSetItemClientData(unsigned int n, void* clientData);
+    virtual void* DoGetItemClientData(unsigned int n) const;
+    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
+    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;

     virtual int DoListHitTest(const wxPoint& point) const;
 
     void DoApplyWidgetStyle(GtkRcStyle *style);
 
 private:
     virtual int DoListHitTest(const wxPoint& point) const;
 
     void DoApplyWidgetStyle(GtkRcStyle *style);
 
 private:

+    void Init(); //common construction
+

     DECLARE_DYNAMIC_CLASS(wxListBox)
 };
 
     DECLARE_DYNAMIC_CLASS(wxListBox)
 };