moved MGL initialization to earlier stage (crashes otherwise...) and implemented...

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

diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index ea5c0080896f3c812faf4b620cccc4fbe71d063b..70715fd9484c8cdd429bef045cc56f9c762cf6ff 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 wxListBoxBase

 {
 DECLARE_DYNAMIC_CLASS(wxListBox)
 
 {
 DECLARE_DYNAMIC_CLASS(wxListBox)
 


@@ -54,9 +54,22 @@ 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);

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

     virtual int FindString(const wxString& s) const ;
     virtual void Clear();
     virtual void SetSelection(int n, bool select = TRUE);
     virtual int FindString(const wxString& s) const ;
     virtual void Clear();
     virtual void SetSelection(int n, bool select = TRUE);


@@ -66,15 +79,15 @@ public:
     // For single choice list item only
     virtual int GetSelection() const ;
     virtual void Delete(int n);
     // For single choice list item only
     virtual int GetSelection() const ;
     virtual void Delete(int n);

-    virtual char *GetClientData(int n) const ;
+    virtual void *GetClientData(int n) const ;

     virtual void *GetClientData() { return wxWindow::GetClientData(); }
     virtual void *GetClientData() { return wxWindow::GetClientData(); }

-    virtual void SetClientData(int n, char *clientData);
+    virtual void SetClientData(int n, void *clientData);

     virtual void SetClientData( void *data ) { wxWindow::SetClientData(data); }
     virtual void SetString(int n, const wxString& s);
 
     // For single or multiple choice list item
     virtual int GetSelections(wxArrayInt& aSelections) const;
     virtual void SetClientData( void *data ) { wxWindow::SetClientData(data); }
     virtual void SetString(int n, const wxString& s);
 
     // For single or multiple choice list item
     virtual int GetSelections(wxArrayInt& aSelections) const;

-    virtual bool Selected(int n) const ;
+    virtual bool IsSelected(int n) const ;

     virtual wxString GetString(int n) const ;
 
     // Set the specified item at the first visible item
     virtual wxString GetString(int n) const ;
 
     // Set the specified item at the first visible item