Bo's patch adding Selection API and some more changes, doesn't compile yet

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

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index 6255f13225651af711bf9fcb2e0ba08666fbdd89..cd19a9a5035a8edf4ce9333c5958983c024c0379 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     24.12.00
 // RCS-ID:      $Id$
-// Copyright:   (c) 1996-2000 wxWindows team
+// Copyright:   (c) 1996-2000 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -16,12 +16,13 @@
 
 #if wxUSE_COMBOBOX
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxComboBoxBase: this interface defines the methods wxComboBox must implement
 // ----------------------------------------------------------------------------
 
+#include "wx/textctrl.h"
 #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 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;
@@ -45,6 +46,27 @@ public:
         { 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;
+
+    // may return value different from GetSelection() when the combobox
+    // dropdown is shown and the user selected, but not yet accepted, a value
+    // different from the old one in it
+    virtual int GetCurrentSelection() const { return GetSelection(); }
+
+    // redeclare inherited SetSelection() overload here as well to avoid
+    // virtual function hiding
+    virtual void SetSelection(int n) = 0;
 };
 
 // ----------------------------------------------------------------------------
@@ -57,16 +79,16 @@ public:
     #include "wx/msw/combobox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/combobox.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/combobox.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/combobox.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/combobox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/combobox.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/combobox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/combobox.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/combobox.h"
 #endif
 
 #endif // wxUSE_COMBOBOX