X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12cb75919071a7cda9e7896ee6d937ccf08a8153..4264606eedb18f626e864020082d8dde8d055eea:/include/wx/mac/carbon/listbox.h

diff --git a/include/wx/mac/carbon/listbox.h b/include/wx/mac/carbon/listbox.h
index cde52946d1..9d4800171f 100644
--- a/include/wx/mac/carbon/listbox.h
+++ b/include/wx/mac/carbon/listbox.h
@@ -21,7 +21,7 @@
 // forward decl for GetSelections()
 class wxArrayInt;
 
-// forward decl for GetPeer() 
+// forward decl for wxMacListControl data type.
 class wxMacListControl;
 
 // List box item
@@ -40,7 +40,7 @@ public:
 
     wxListBox(
         wxWindow *parent,
-        wxWindowID id,
+        wxWindowID winid,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         int n = 0, const wxString choices[] = NULL,
@@ -48,12 +48,12 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxListBoxNameStr)
     {
-        Create(parent, id, pos, size, n, choices, style, validator, name);
+        Create(parent, winid, pos, size, n, choices, style, validator, name);
     }
 
     wxListBox(
         wxWindow *parent,
-        wxWindowID id,
+        wxWindowID winid,
         const wxPoint& pos,
         const wxSize& size,
         const wxArrayString& choices,
@@ -61,12 +61,12 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxListBoxNameStr)
     {
-        Create(parent, id, pos, size, choices, style, validator, name);
+        Create(parent, winid, pos, size, choices, style, validator, name);
     }
 
     bool Create(
         wxWindow *parent,
-        wxWindowID id,
+        wxWindowID winid,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         int n = 0,
@@ -77,7 +77,7 @@ public:
 
     bool Create(
         wxWindow *parent,
-        wxWindowID id,
+        wxWindowID winid,
         const wxPoint& pos,
         const wxSize& size,
         const wxArrayString& choices,
@@ -89,8 +89,6 @@ public:
 
     // implement base class pure virtuals
     virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);
-    virtual void Clear();
-    virtual void Delete(unsigned int n);
 
     virtual unsigned int GetCount() const;
     virtual wxString GetString(unsigned int n) const;
@@ -101,40 +99,36 @@ public:
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
+    virtual void EnsureVisible(int n);
+
     // wxCheckListBox support
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
-    wxMacListControl * GetPeer() const { return (wxMacListControl*)m_peer; }
+    wxMacListControl* GetPeer() const;
 
-    wxArrayString m_stringArray;
-    wxListDataArray m_dataArray;
-    
 protected:
-    // common creation for all databrowser list implementations
-    wxMacListControl* CreateMacListControl(const wxPoint& pos, const wxSize& size, long style);
-    
-    // internal storage for line n has changed, issue a redraw
-    void MacUpdateLine(int n);
-    
-    virtual void DoSetSelection(int n, bool select);
-    virtual int DoAppend(const wxString& item);
-    virtual void DoInsertItems(const wxArrayString& items, unsigned int pos);
-    virtual void DoSetItems(const wxArrayString& items, void **clientData);
-    virtual void DoSetFirstItem(int n);
+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n);
+
+    // from wxItemContainer
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
+
     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 void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+
+    // from wxListBoxBase
+    virtual void DoSetSelection(int n, bool select);
+    virtual void DoSetFirstItem(int n);
     virtual int DoListHitTest(const wxPoint& point) const;
-    virtual wxSize DoGetBestSize() const;
 
     // free memory (common part of Clear() and dtor)
     // prevent collision with some BSD definitions of macro Free()
     void FreeData();
 
-    unsigned int m_noItems;
+    virtual wxSize DoGetBestSize() const;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxListBox)