correction for Mac OS X

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

diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index d7585a547e6dd9ddeccc6d78672bda2dd0d050df..6f352ec72878209041543fa2a43dd2a6b98c96a9 100644 (file)
--- a/include/wx/motif/listbox.h
+++ b/include/wx/motif/listbox.h
@@ -16,7 +16,7 @@
 #pragma interface "listbox.h"
 #endif
 
 #pragma interface "listbox.h"
 #endif
 

-#include "wx/control.h"
+#include "wx/ctrlsub.h"

 
 WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
 
 
 WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
 


@@ -26,7 +26,7 @@ class WXDLLEXPORT wxArrayInt;
 WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 
 // List box item
 WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 
 // List box item

-class WXDLLEXPORT wxListBox: public wxControl
+class WXDLLEXPORT wxListBox: public wxControlWithItems

 {
 DECLARE_DYNAMIC_CLASS(wxListBox)
 
 {
 DECLARE_DYNAMIC_CLASS(wxListBox)
 


@@ -54,6 +54,19 @@ public:
 
     ~wxListBox();
 
 
     ~wxListBox();
 

+    // Virtual functions required by wxControlWithItems.
+    // They are not all implemented yet :-(
+    virtual int GetCount() const;
+    virtual int DoAppend(const wxString& item);
+    virtual void DoInsertItems(const wxArrayString& items, int pos);
+    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 Select(int n);
+

     virtual void Append(const wxString& item);
     virtual void Append(const wxString& item, void *clientData);
     virtual void Set(int n, const wxString* choices, void **clientData = NULL);
     virtual void Append(const wxString& item);
     virtual void Append(const wxString& item, void *clientData);
     virtual void Set(int n, const wxString* choices, void **clientData = NULL);