X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfc6fde4b1dd5bfd8ae22839ff9a69cf24eb9120..6d9022fe3bb50a75b9b5eaf5cf32558e518ba310:/include/wx/motif/listbox.h?ds=sidebyside

diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index ea5c008089..883a42b420 100644
--- a/include/wx/motif/listbox.h
+++ b/include/wx/motif/listbox.h
@@ -16,7 +16,7 @@
 #pragma interface "listbox.h"
 #endif
 
-#include "wx/control.h"
+#include "wx/ctrlsub.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
 
@@ -26,87 +26,100 @@ class WXDLLEXPORT wxArrayInt;
 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)
+        
 public:
     wxListBox();
     wxListBox(wxWindow *parent, wxWindowID id,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr):
-        m_clientDataList(wxKEY_INTEGER)
-        {
-            Create(parent, id, pos, size, n, choices, style, validator, name);
-        }
-
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        int n = 0, const wxString choices[] = NULL,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxListBoxNameStr):
+    m_clientDataList(wxKEY_INTEGER)
+    {
+        Create(parent, id, pos, size, n, choices, style, validator, name);
+    }
+    
     bool Create(wxWindow *parent, wxWindowID id,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr);
-
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        int n = 0, const wxString choices[] = NULL,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxListBoxNameStr);
+    
     ~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, 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 void Deselect(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 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 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
     // or scroll to max range.
     virtual void SetFirstItem(int n) ;
     virtual void SetFirstItem(const wxString& s) ;
-
+    
     virtual void InsertItems(int nItems, const wxString items[], int pos);
-
+    
     virtual wxString GetStringSelection() const ;
     virtual bool SetStringSelection(const wxString& s, bool flag = TRUE);
     virtual int Number() const ;
-
+    
     void Command(wxCommandEvent& event);
-
+    
     // Implementation
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     WXWidget GetTopWidget() const;
-
+    
 protected:
     int       m_noItems;
     int       m_selected;
-
+    
     // List mapping positions->client data
     wxList    m_clientDataList;
-
+    
     virtual void DoSetSize(int x, int y,
-            int width, int height,
-            int sizeFlags = wxSIZE_AUTO);
+        int width, int height,
+        int sizeFlags = wxSIZE_AUTO);
 };
 
 #endif
-    // _WX_LISTBOX_H_
+// _WX_LISTBOX_H_