X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef41d80cdfa98391d8530c4b142c9816e0519e68..a2ee1945871d7b9d71ec18954ffb2f0f239c2e57:/include/wx/motif/listbox.h

diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index 506dfbf2c0..6a7f3bb513 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;
+class WXDLLIMPEXP_FWD_BASE wxArrayInt;
 
 // List box item
-class WXDLLEXPORT wxListBox: public wxListBoxBase
+class WXDLLIMPEXP_CORE 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,52 +54,51 @@ public:
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxListBoxNameStr);
-    
-    ~wxListBox();
-    
+
+    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);
+
     // implementation of wxControlWithItems
-    virtual int GetCount() const;
-    virtual int DoAppend(const wxString& item);
-    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 unsigned int GetCount() const;
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
     virtual int GetSelection() const;
-    virtual void Delete(int n);
-    virtual int FindString(const wxString& s) const;
-    virtual void Clear();
-    virtual void SetString(int n, const wxString& s);
-    virtual wxString GetString(int n) const;
+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual int FindString(const wxString& s, bool bCase = false) const;
+    virtual void DoClear();
+    virtual void SetString(unsigned int n, const wxString& s);
+    virtual wxString GetString(unsigned int n) const;
 
     // implementation of wxListBoxbase
-    virtual void SetSelection(int n, bool select = TRUE);
-    virtual void DoInsertItems(const wxArrayString& items, int pos);
-    virtual void DoSetItems(const wxArrayString& items, void **clientData);
+    virtual void DoSetSelection(int n, bool select);
     virtual void DoSetFirstItem(int n);
     virtual int GetSelections(wxArrayInt& aSelections) 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 item, int x) {};
+    virtual void DoToggleItem(int WXUNUSED(item), int WXUNUSED(x)) {}
 #endif
 protected:
-    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);
+    virtual wxSize DoGetBestSize() const;
+
+    unsigned int m_noItems;
+
+private:
+    void SetSelectionPolicy();
 };
 
 #endif