X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..3f7bc32b539472f7aa577ffa140e287b0dc4c90d:/include/wx/mac/listbox.h?ds=sidebyside

diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h
index 0ab770ac57..a312aec593 100644
--- a/include/wx/mac/listbox.h
+++ b/include/wx/mac/listbox.h
@@ -9,93 +9,111 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 
 #ifdef __GNUG__
-#pragma interface "listbox.h"
+    #pragma interface "listbox.h"
 #endif
 
-#include "wx/control.h"
-#include "wx/dynarray.h"
+// ----------------------------------------------------------------------------
+// simple types
+// ----------------------------------------------------------------------------
 
-WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
+#if wxUSE_OWNER_DRAWN
+  class WXDLLEXPORT wxOwnerDrawn;
 
-// forward decl for GetSelections()
-class WXDLLEXPORT wxArrayInt;
+  // define the array of list box items
+  #include  <wx/dynarray.h>
 
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+  WX_DEFINE_EXPORTED_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
+#endif // wxUSE_OWNER_DRAWN
+
+// forward decl for GetSelections()
+class wxArrayInt;
 
 // List box item
 
 WX_DEFINE_ARRAY( char * , wxListDataArray ) ;
 
-class WXDLLEXPORT wxListBox: public wxControl
+// ----------------------------------------------------------------------------
+// List box control
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxListBox : public wxListBoxBase
 {
-  DECLARE_DYNAMIC_CLASS(wxListBox)
- public:
-
-  wxListBox();
-  inline 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)
-  {
-    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);
-
-  ~wxListBox();
-
-  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 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 SetClientData(int n, char *clientData);
-  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 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);
-
-	void MacSetRedraw( bool doDraw ) ;
- protected:
-  int       m_noItems;
-  int       m_selected;
-  
+public:
+    // ctors and such
+    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)
+    {
+        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);
+
+    virtual ~wxListBox();
+
+    // implement base class pure virtuals
+    virtual void Clear();
+    virtual void Delete(int n);
+
+    virtual int GetCount() const;
+    virtual wxString GetString(int n) const;
+    virtual void SetString(int n, const wxString& s);
+    virtual int FindString(const wxString& s) const;
+
+    virtual bool IsSelected(int n) const;
+    virtual void SetSelection(int n, bool select = TRUE);
+    virtual int GetSelection() const;
+    virtual int GetSelections(wxArrayInt& aSelections) 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;
+
+    // wxCheckListBox support
+#if wxUSE_OWNER_DRAWN
+    // plug-in for derived classes
+    virtual wxOwnerDrawn *CreateItem(size_t n);
+
+    // allows to get the item and use SetXXX functions to set it's appearance
+    wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; }
+
+    // get the index of the given item
+    int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); }
+#endif // wxUSE_OWNER_DRAWN
+
+    // Windows callbacks
+
+    virtual void SetupColours();
+    virtual void	MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+
+  	ListHandle		m_macList ;
+	wxArrayString 	m_stringArray ;
+	wxListDataArray m_dataArray ;
+	void 			MacSetRedraw( bool doDraw ) ;
+protected:
 	void			MacDestroy() ;			
 	void			MacDelete( int n ) ;
 	void			MacInsert( int n , const char * text) ;
@@ -111,13 +129,25 @@ class WXDLLEXPORT wxListBox: public wxControl
 	void			MacDoClick() ;
 	void			MacDoDoubleClick() ;
 
- public :
-  ListHandle	m_macList ;
-	wxArrayString m_stringArray ;
-	wxListDataArray m_dataArray ;
-	
-    virtual void	MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
-DECLARE_EVENT_TABLE()
+    // do we have multiple selections?
+    bool HasMultipleSelection() const;
+
+    // free memory (common part of Clear() and dtor)
+    void Free();
+
+    int m_noItems;
+    int m_selected;
+
+    virtual wxSize DoGetBestSize() const ;
+
+#if wxUSE_OWNER_DRAWN
+    // control items
+    wxListBoxItemsArray m_aItems;
+#endif
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxListBox)
+	DECLARE_EVENT_TABLE()
 };
 
 #endif