A few Unicode fixes.

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

diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h
index 2a5f428da1a75343b65a1c9b29383639908df0d6..fa19c2d4f9617f6e639fb35212aba873d2e327a3 100644 (file)
--- a/include/wx/gtk/listbox.h
+++ b/include/wx/gtk/listbox.h
@@ -51,7 +51,9 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr )
     {
+#if wxUSE_CHECKLISTBOX
         m_hasCheckBoxes = FALSE;
+#endif // wxUSE_CHECKLISTBOX
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
     virtual ~wxListBox();
@@ -68,11 +70,18 @@ public:
     void Append( const wxString &item, void* clientData );
     void Append( const wxString &item, wxClientData* clientData );
 
+    void InsertItems(int nItems, const wxString items[], int pos);
+
     void SetClientData( int n, void* clientData );
     void* GetClientData( int n );
     void SetClientObject( int n, wxClientData* clientData );
     wxClientData* GetClientObject( int n );
 
+    void SetClientObject( wxClientData *data )  { wxControl::SetClientObject( data ); }
+    wxClientData *GetClientObject() const       { return wxControl::GetClientObject(); }
+    void SetClientData( void *data )            { wxControl::SetClientData( data ); }
+    void *GetClientData() const                 { return wxControl::GetClientData(); }
+    
     void Clear();
     void Delete( int n );
 
@@ -104,13 +113,16 @@ public:
     void ApplyWidgetStyle();
 
 #if wxUSE_TOOLTIPS
-    void ApplyToolTip( GtkTooltips *tips, const char *tip );
+    void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS
 
     GtkList   *m_list;
     wxList     m_clientDataList;
     wxList     m_clientObjectList;
+
+#if wxUSE_CHECKLISTBOX
     bool       m_hasCheckBoxes;
+#endif // wxUSE_CHECKLISTBOX
 };
 
 #endif // __GTKLISTBOXH__