X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c27eab7e9ce512e052046886a33c5f5002d42573..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/motif/textctrl.h diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h index 091f5e6763..e391854724 100644 --- a/include/wx/motif/textctrl.h +++ b/include/wx/motif/textctrl.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: textctrl.h +// Name: wx/motif/textctrl.h // Purpose: wxTextCtrl class // Author: Julian Smart // Modified by: @@ -12,32 +12,13 @@ #ifndef _WX_TEXTCTRL_H_ #define _WX_TEXTCTRL_H_ -#ifdef __GNUG__ - #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 WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase { - DECLARE_DYNAMIC_CLASS(wxTextCtrl) - public: // creation // -------- + wxTextCtrl(); wxTextCtrl(wxWindow *parent, wxWindowID id, @@ -47,12 +28,9 @@ 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); - } + { + Create(parent, id, value, pos, size, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, @@ -64,7 +42,6 @@ public: // accessors // --------- virtual wxString GetValue() const; - virtual void SetValue(const wxString& value); virtual int GetLineLength(long lineNo) const; virtual wxString GetLineText(long lineNo) const; @@ -73,45 +50,13 @@ public: // operations // ---------- - // Clipboard operations - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); - - virtual void SetInsertionPoint(long pos); - virtual void SetInsertionPointEnd(); - virtual long GetInsertionPoint() const; - virtual long GetLastPosition() const; - 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 SetEditable(bool editable); - - // 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); - virtual void AppendText(const wxString& text); + virtual void MarkDirty(); virtual void DiscardEdits(); 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(); // callbacks // --------- @@ -119,11 +64,23 @@ 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 // ----------------------------------- - virtual void ChangeFont(bool keepOriginalSize = TRUE); + virtual void ChangeFont(bool keepOriginalSize = true); virtual void ChangeBackgroundColour(); virtual void ChangeForegroundColour(); void SetModified(bool mod) { m_modified = mod; } @@ -134,7 +91,11 @@ public: long keycode); protected: - wxString m_fileName; + virtual wxSize DoGetBestSize() const; + + virtual void DoSetValue(const wxString& value, int flags = 0); + + virtual WXWidget GetTextWidget() const { return m_mainWidget; } public: // Motif-specific @@ -147,7 +108,8 @@ public: private: DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxTextCtrl) }; #endif - // _WX_TEXTCTRL_H_ +// _WX_TEXTCTRL_H_