X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ec46a5b35233f3c69c5b73e4b0b36f44c650633..55809d1394516044a90fa34b12070d0f3e9f1439:/include/wx/os2/textctrl.h diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h index ec6eaa5ca1..c868ddc7ae 100644 --- a/include/wx/os2/textctrl.h +++ b/include/wx/os2/textctrl.h @@ -12,6 +12,8 @@ #ifndef _WX_TEXTCTRL_H_ #define _WX_TEXTCTRL_H_ +typedef int (wxCALLBACK *wxTreeCtrlCompare)(long lItem1, long lItem2, long lSortData); + class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase { public: @@ -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,12 +71,14 @@ 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); virtual void AppendText(const wxString& rsText); + virtual bool EmulateKeyPress(const wxKeyEvent& rEvent); virtual bool SetStyle( long lStart ,long lEnd @@ -111,12 +111,13 @@ 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 SetWindowStyleFlag(long lStyle); // // Implementation from now on @@ -152,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;} @@ -169,6 +174,15 @@ protected: // void AdjustSpaceLimit(void); virtual wxSize DoGetBestSize(void) const; + virtual bool OS2ShouldPreProcessMessage(WXMSG* pMsg); + + virtual WXDWORD OS2GetStyle( long lStyle + ,WXDWORD* dwExstyle + ) const; + + virtual void DoSetValue(const wxString &value, int flags = 0); + + bool m_bSkipUpdate; private: bool m_bIsMLE;