X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/421a84317fc3d53ac4fd64613f1af2d19018efc5..2d6dd9c09e7084d402fc923d2f09d8b7158a1a04:/include/wx/combobox.h diff --git a/include/wx/combobox.h b/include/wx/combobox.h index fa705b0c10..6b361163ea 100644 --- 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,23 @@ 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; + + + // redeclare inherited SetSelection() overload here as well to avoid + // virtual function hiding + virtual void SetSelection(int n) = 0; }; // ---------------------------------------------------------------------------- @@ -57,8 +75,10 @@ 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(__WXGTK__) + #include "wx/gtk1/combobox.h" #elif defined(__WXMAC__) #include "wx/mac/combobox.h" #elif defined(__WXCOCOA__)