X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d0edc0f7306aac10a75c545f9cace25d3cee83d..eafdb19c44154550b3c6155a62642e7ab5c6e64d:/include/wx/os2/textctrl.h diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h index b7a701274f..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: @@ -12,7 +12,9 @@ #ifndef _WX_TEXTCTRL_H_ #define _WX_TEXTCTRL_H_ -class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase +typedef int (wxCALLBACK *wxTreeCtrlCompare)(long lItem1, long lItem2, long lSortData); + +class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase { public: wxTextCtrl(); @@ -22,14 +24,13 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxTextCtrlNameStr ) { Create(pParent, vId, rsValue, rPos, rSize, lStyle, rValidator, rsName); } + virtual ~wxTextCtrl(); bool Create( wxWindow* pParent ,wxWindowID vId @@ -37,9 +38,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxTextCtrlNameStr ); @@ -48,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; @@ -73,8 +71,9 @@ public: ,long lTo ); - virtual bool LoadFile(const wxString& rsFile); + virtual bool DoLoadFile(const wxString& rsFile, int fileType); + virtual void MarkDirty(); virtual void DiscardEdits(void); virtual void WriteText(const wxString& rsText); @@ -112,13 +111,12 @@ public: virtual void SetInsertionPoint(long lPos); virtual void SetInsertionPointEnd(void); virtual long GetInsertionPoint(void) const; - virtual long GetLastPosition(void) const; + virtual wxTextPos GetLastPosition(void) const; virtual void SetSelection( long lFrom ,long lTo ); virtual void SetEditable(bool bEditable); - virtual void SetFocus(void); virtual void SetWindowStyleFlag(long lStyle); // @@ -155,12 +153,16 @@ public: void OnPaste(wxCommandEvent& rEvent); void OnUndo(wxCommandEvent& rEvent); void OnRedo(wxCommandEvent& rEvent); + void OnDelete(wxCommandEvent& rEvent); + void OnSelectAll(wxCommandEvent& rEvent); void OnUpdateCut(wxUpdateUIEvent& rEvent); void OnUpdateCopy(wxUpdateUIEvent& rEvent); void OnUpdatePaste(wxUpdateUIEvent& rEvent); void OnUpdateUndo(wxUpdateUIEvent& rEvent); void OnUpdateRedo(wxUpdateUIEvent& rEvent); + void OnUpdateDelete(wxUpdateUIEvent& rEvent); + void OnUpdateSelectAll(wxUpdateUIEvent& rEvent); inline bool IsMLE(void) {return m_bIsMLE;} inline void SetMLE(bool bIsMLE) {m_bIsMLE = bIsMLE;} @@ -177,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)