X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca8b28f2efff34b9939035a7aeb1de1e3ac98a0c..d42508c2a026d505d39c386b233de4a1b51f1445:/include/wx/motif/textctrl.h?ds=sidebyside diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h index 6622976caf..6d0bb105de 100644 --- a/include/wx/motif/textctrl.h +++ b/include/wx/motif/textctrl.h @@ -16,22 +16,11 @@ #pragma interface "textctrl.h" #endif -#include "wx/ioswrap.h" -#include "wx/control.h" - -// TODO Some platforms/compilers don't like inheritance from streambuf. -#if (defined(__BORLANDC__) && !defined(__WIN32__)) || defined(__MWERKS__) - #define NO_TEXT_WINDOW_STREAM -#endif - WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr; WXDLLEXPORT_DATA(extern const char*) wxEmptyString; // Single-line text item -class WXDLLEXPORT wxTextCtrl: public wxControl -#ifndef NO_TEXT_WINDOW_STREAM - , public streambuf -#endif +class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase { DECLARE_DYNAMIC_CLASS(wxTextCtrl) @@ -47,9 +36,6 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr) -#ifndef NO_TEXT_WINDOW_STREAM - : streambuf() -#endif { Create(parent, id, value, pos, size, style, validator, name); } @@ -101,20 +87,6 @@ public: virtual void GetSelection(long* from, long* to) const; virtual bool IsEditable() const ; - // streambuf implementation -#ifndef NO_TEXT_WINDOW_STREAM - int overflow(int i); - int sync(); - int underflow(); -#endif - - wxTextCtrl& operator<<(const wxString& s); - wxTextCtrl& operator<<(int i); - wxTextCtrl& operator<<(long i); - wxTextCtrl& operator<<(float f); - wxTextCtrl& operator<<(double d); - wxTextCtrl& operator<<(const char c); - virtual bool LoadFile(const wxString& file); virtual bool SaveFile(const wxString& file); virtual void WriteText(const wxString& text); @@ -123,7 +95,7 @@ public: virtual bool IsModified() const; virtual long XYToPosition(long x, long y) const; - virtual void PositionToXY(long pos, long *x, long *y) const; + virtual bool PositionToXY(long pos, long *x, long *y) const; virtual void ShowPosition(long pos); virtual void Clear(); @@ -133,6 +105,18 @@ public: void OnChar(wxKeyEvent& event); // void OnEraseBackground(wxEraseEvent& event); + void OnCut(wxCommandEvent& event); + void OnCopy(wxCommandEvent& event); + void OnPaste(wxCommandEvent& event); + void OnUndo(wxCommandEvent& event); + void OnRedo(wxCommandEvent& event); + + void OnUpdateCut(wxUpdateUIEvent& event); + void OnUpdateCopy(wxUpdateUIEvent& event); + void OnUpdatePaste(wxUpdateUIEvent& event); + void OnUpdateUndo(wxUpdateUIEvent& event); + void OnUpdateRedo(wxUpdateUIEvent& event); + virtual void Command(wxCommandEvent& event); // implementation from here to the end