mac cleanup

[wxWidgets.git] / include / wx / mac / carbon / combobox.h

diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h
index 1622c07a18fccf4809eeab1b75bf092c4011d212..c38095768dc6a5a7be00fbe18c07d8fd99c1885d 100644 (file)
--- a/include/wx/mac/carbon/combobox.h
+++ b/include/wx/mac/carbon/combobox.h
@@ -15,7 +15,7 @@
 #include "wx/containr.h"
 #include "wx/choice.h"
 
 #include "wx/containr.h"
 #include "wx/choice.h"
 

-WXDLLEXPORT_DATA(extern const wxChar) wxComboBoxNameStr[];
+WXDLLEXPORT_DATA(extern const char) wxComboBoxNameStr[];

 
 // forward declaration of private implementation classes
 
 
 // forward declaration of private implementation classes
 


@@ -84,12 +84,7 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 

-    // List functions
-    virtual void Delete(unsigned int n);
-    virtual void Clear();
-

     virtual int GetSelection() const;
     virtual int GetSelection() const;

-    int GetCurrentSelection() const { return GetSelection(); }

     virtual void SetSelection(int n);
     virtual int FindString(const wxString& s, bool bCase = false) const;
     virtual wxString GetString(unsigned int n) const;
     virtual void SetSelection(int n);
     virtual int FindString(const wxString& s, bool bCase = false) const;
     virtual wxString GetString(unsigned int n) const;


@@ -97,8 +92,10 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
     virtual void SetString(unsigned int n, const wxString& s);
 
     // Text field functions
     virtual void SetString(unsigned int n, const wxString& s);
 
     // Text field functions

-    virtual wxString GetValue() const;

     virtual void SetValue(const wxString& value);
     virtual void SetValue(const wxString& value);

+    virtual wxString GetValue() const;
+    virtual void WriteText(const wxString& text);
+    virtual void GetSelection(long *from, long *to) const;

 
     // Clipboard operations
     virtual void Copy();
 
     // Clipboard operations
     virtual void Copy();


@@ -126,6 +123,8 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
 
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
 

+    virtual wxClientDataType GetClientDataType() const;
+

     wxInt32 MacControlHit( WXEVENTHANDLERREF handler, WXEVENTREF event );
 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
     wxInt32 MacControlHit( WXEVENTHANDLERREF handler, WXEVENTREF event );
 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST


@@ -136,19 +135,22 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-    void FreeData();
+    // List functions
+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual void DoClear();

 
     // override the base class virtuals involved in geometry calculations
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
 
     // override the base class virtuals involved in geometry calculations
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
 

-    virtual int DoAppend(const wxString& item);
-    virtual int DoInsert(const wxString& item, unsigned int pos);
+    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 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 SetClientDataType(wxClientDataType clientDataItemsType);

 
     // the subcontrols
     wxComboBoxText*     m_text;
 
     // the subcontrols
     wxComboBoxText*     m_text;