no changes, just update the copyright in the header

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

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index 48fc4225f4dd13d887f72b3946f6af6cd4540582..2b26eb5180bf2427f7cf9f23dc1a45fc0d371c14 100644 (file)
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -31,7 +31,7 @@ class WXDLLIMPEXP_FWD_CORE wxListBox;
 // wxComboBox: a combination of text control and a listbox
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxComboBox : public wxComboCtrl, public wxComboBoxBase
+class WXDLLIMPEXP_CORE wxComboBox : public wxComboCtrl, public wxComboBoxBase
 {
 public:
     // ctors and such
@@ -93,6 +93,7 @@ public:
     // 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();
@@ -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 GetSelection(long *from, long *to) const;
     virtual void SetEditable(bool editable);
     virtual bool IsEditable() const;
 
@@ -125,6 +127,7 @@ public:
     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
 
@@ -142,6 +145,11 @@ public:
         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:
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
@@ -150,6 +158,7 @@ protected:
     virtual void DoSetItemClientData(unsigned int n, void* clientData);
     virtual void* DoGetItemClientData(unsigned int n) const;
 
+
     // common part of all ctors
     void Init();