oops, removed duplicate SetIcons[s]() added in last commit

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

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index ff4980c5512218508397b1f460c260b04236f09a..051737b64677c4a63b7e33df13cd4c9943bd3aee 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -6,7 +6,7 @@
 // Created:     24.12.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996-2000 wxWidgets team
 // Created:     24.12.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996-2000 wxWidgets team

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COMBOBOX_H_BASE_
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COMBOBOX_H_BASE_


@@ -16,12 +16,13 @@
 
 #if wxUSE_COMBOBOX
 
 
 #if wxUSE_COMBOBOX
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxComboBoxNameStr;

 
 // ----------------------------------------------------------------------------
 // wxComboBoxBase: this interface defines the methods wxComboBox must implement
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxComboBoxBase: this interface defines the methods wxComboBox must implement
 // ----------------------------------------------------------------------------
 

+#include "wx/textctrl.h"

 #include "wx/ctrlsub.h"
 
 class WXDLLEXPORT wxComboBoxBase : public wxItemContainer
 #include "wx/ctrlsub.h"
 
 class WXDLLEXPORT wxComboBoxBase : public wxItemContainer


@@ -36,7 +37,7 @@ public:
     virtual void Paste() = 0;
     virtual void SetInsertionPoint(long pos) = 0;
     virtual long GetInsertionPoint() const = 0;
     virtual void Paste() = 0;
     virtual void SetInsertionPoint(long pos) = 0;
     virtual long GetInsertionPoint() const = 0;

-    virtual long GetLastPosition() const = 0;
+    virtual wxTextPos GetLastPosition() const = 0;

     virtual void Replace(long from, long to, const wxString& value) = 0;
     virtual void SetSelection(long from, long to) = 0;
     virtual void SetEditable(bool editable) = 0;
     virtual void Replace(long from, long to, const wxString& value) = 0;
     virtual void SetSelection(long from, long to) = 0;
     virtual void SetEditable(bool editable) = 0;


@@ -45,6 +46,23 @@ public:
         { SetInsertionPoint(GetLastPosition()); }
     virtual void Remove(long from, long to)
         { Replace(from, to, wxEmptyString); }
         { SetInsertionPoint(GetLastPosition()); }
     virtual void Remove(long from, long to)
         { Replace(from, to, wxEmptyString); }

+
+    virtual bool IsEditable() const = 0;
+
+    virtual void Undo() = 0;
+    virtual void Redo() = 0;
+    virtual void SelectAll() = 0;
+
+    virtual bool CanCopy() const = 0;
+    virtual bool CanCut() const = 0;
+    virtual bool CanPaste() const = 0;
+    virtual bool CanUndo() const = 0;
+    virtual bool CanRedo() const = 0;
+
+
+    // redeclare inherited SetSelection() overload here as well to avoid
+    // virtual function hiding
+    virtual void SetSelection(int n) = 0;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------