Better fix

[wxWidgets.git] / include / wx / univ / combobox.h

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index 383582c06fb6eedb7a64261bbf311d341061789a..78bdc7059a02d5a4d678c9e2dfa0152d70111358 100644 (file)
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -15,7 +15,7 @@
 
 #include "wx/combo.h"
 
 
 #include "wx/combo.h"
 

-class WXDLLEXPORT wxListBox;
+class WXDLLIMPEXP_FWD_CORE wxListBox;

 
 // ----------------------------------------------------------------------------
 // NB: some actions supported by this control are in wx/generic/combo.h
 
 // ----------------------------------------------------------------------------
 // NB: some actions supported by this control are in wx/generic/combo.h


@@ -93,6 +93,7 @@ public:
     // wxTextCtrl methods
     virtual wxString GetValue() const;
     virtual void SetValue(const wxString& value);
     // wxTextCtrl methods
     virtual wxString GetValue() const;
     virtual void SetValue(const wxString& value);

+    virtual void WriteText(const wxString& value);

     virtual void Copy();
     virtual void Cut();
     virtual void Paste();
     virtual void Copy();
     virtual void Cut();
     virtual void Paste();


@@ -103,6 +104,7 @@ public:
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
     virtual void SetSelection(long from, long to);
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
     virtual void SetSelection(long from, long to);

+    virtual void GetSelection(long *from, long *to) const;

     virtual void SetEditable(bool editable);
     virtual bool IsEditable() const;
 
     virtual void SetEditable(bool editable);
     virtual bool IsEditable() const;
 


@@ -117,14 +119,15 @@ public:
     virtual bool CanRedo() const;
 
     // wxControlWithItems methods
     virtual bool CanRedo() const;
 
     // wxControlWithItems methods

-    virtual void Clear();
-    virtual void Delete(unsigned int n);
+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n);

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

+    virtual wxString GetStringSelection() const;

 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 


@@ -142,13 +145,19 @@ public:
         return GetStdInputHandler(handlerDef);
     }
 
         return GetStdInputHandler(handlerDef);
     }
 

+    // we delegate our client data handling to wxListBox which we use for the
+    // items, so override this and other methods dealing with the client data
+    virtual wxClientDataType GetClientDataType() const;
+    virtual void SetClientDataType(wxClientDataType clientDataItemsType);
+

 protected:
 protected:

-    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;
+

 
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();