X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..f321ab7fb40525098cea6594ffbf2daf0186b1a3:/include/wx/motif/listbox.h?ds=sidebyside

diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index 883a42b420..d124453bde 100644
--- a/include/wx/motif/listbox.h
+++ b/include/wx/motif/listbox.h
@@ -1,35 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        listbox.h
+// Name:        wx/motif/listbox.h
 // Purpose:     wxListBox class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 
-#ifdef __GNUG__
-#pragma interface "listbox.h"
-#endif
-
 #include "wx/ctrlsub.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
+#include "wx/clntdata.h"
 
 // forward decl for GetSelections()
 class WXDLLEXPORT wxArrayInt;
 
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
-
 // List box item
 class WXDLLEXPORT wxListBox: public wxListBoxBase
 {
     DECLARE_DYNAMIC_CLASS(wxListBox)
-        
+
 public:
     wxListBox();
     wxListBox(wxWindow *parent, wxWindowID id,
@@ -38,12 +31,22 @@ public:
         int n = 0, const wxString choices[] = NULL,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr):
-    m_clientDataList(wxKEY_INTEGER)
+        const wxString& name = wxListBoxNameStr)
     {
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
-    
+
+    wxListBox(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size,
+        const wxArrayString& choices,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxListBoxNameStr)
+    {
+        Create(parent, id, pos, size, choices, style, validator, name);
+    }
+
     bool Create(wxWindow *parent, wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
@@ -51,74 +54,59 @@ public:
         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;
+
+    bool Create(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size,
+        const wxArrayString& choices,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxListBoxNameStr);
+
+    virtual ~wxListBox();
+
+    // implementation of wxControlWithItems
+    virtual unsigned int GetCount() const;
     virtual int DoAppend(const wxString& item);
-    virtual void DoInsertItems(const wxArrayString& items, int pos);
+    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 GetSelection() const;
+    virtual void Delete(unsigned int n);
+    virtual int FindString(const wxString& s, bool bCase = false) const;
+    virtual void Clear();
+    virtual void SetString(unsigned int n, const wxString& s);
+    virtual wxString GetString(unsigned int n) const;
+
+    // implementation of wxListBoxbase
+    virtual void DoSetSelection(int n, bool select);
+    virtual void DoInsertItems(const wxArrayString& items, unsigned 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 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 void *GetClientData(int n) const ;
-    virtual void *GetClientData() { return wxWindow::GetClientData(); }
-    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 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 ;
-    
+    virtual bool IsSelected(int n) const;
+
+    // For single or multiple choice list item
     void Command(wxCommandEvent& event);
-    
+
     // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     WXWidget GetTopWidget() const;
-    
+
+#if wxUSE_CHECKLISTBOX
+    virtual void DoToggleItem(int WXUNUSED(item), int WXUNUSED(x)) {};
+#endif
 protected:
-    int       m_noItems;
-    int       m_selected;
-    
+    virtual wxSize DoGetBestSize() const;
+
+    unsigned int m_noItems;
+
     // List mapping positions->client data
-    wxList    m_clientDataList;
-    
-    virtual void DoSetSize(int x, int y,
-        int width, int height,
-        int sizeFlags = wxSIZE_AUTO);
+    wxClientDataDictionary m_clientDataDict;
+private:
+    void SetSelectionPolicy();
 };
 
 #endif