X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..b5ec0c78b521cfa0f276e4d5d830f35b4fa26e91:/include/wx/os2/textctrl.h?ds=sidebyside diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h index 547e1191a9..59a7570ad4 100644 --- a/include/wx/os2/textctrl.h +++ b/include/wx/os2/textctrl.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: textctrl.h +// Name: wx/os2/textctrl.h // Purpose: wxTextCtrl class // Author: David Webster // Modified by: @@ -14,7 +14,7 @@ typedef int (wxCALLBACK *wxTreeCtrlCompare)(long lItem1, long lItem2, long lSortData); -class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase +class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase { public: wxTextCtrl(); @@ -47,7 +47,6 @@ public: // ---------------------------------- // virtual wxString GetValue(void) const; - virtual void SetValue(const wxString& rsValue); virtual int GetLineLength(long nLineNo) const; virtual wxString GetLineText(long nLineNo) const; @@ -72,7 +71,7 @@ public: ,long lTo ); - virtual bool LoadFile(const wxString& rsFile); + virtual bool DoLoadFile(const wxString& rsFile, int fileType); virtual void MarkDirty(); virtual void DiscardEdits(void); @@ -180,7 +179,16 @@ protected: virtual WXDWORD OS2GetStyle( long lStyle ,WXDWORD* dwExstyle ) const; + + virtual void DoSetValue(const wxString &value, int flags = 0); + + bool m_bSkipUpdate; + private: + // implement wxTextEntry pure virtual: it implements all the operations for + // the simple EDIT controls + virtual WXHWND GetEditHWND() const { return m_hWnd; } + bool m_bIsMLE; DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxTextCtrl)