Applied patch [ 1181975 ] [wxMSW] Removes all flicker from wxNotebook

[wxWidgets.git] / include / wx / os2 / textctrl.h

diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h
index ec6eaa5ca1ce09de0e301a46d5246ac3ad7296c6..7e4a1127b8b5d2595d92672310362dc3ae79a85c 100644 (file)
--- a/include/wx/os2/textctrl.h
+++ b/include/wx/os2/textctrl.h
@@ -12,6 +12,8 @@
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 

+typedef int (wxCALLBACK *wxTreeCtrlCompare)(long lItem1, long lItem2, long lSortData);
+

 class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
 {
 public:
 class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
 {
 public:


@@ -22,14 +24,13 @@ public:
                ,const wxPoint&     rPos = wxDefaultPosition
                ,const wxSize&      rSize = wxDefaultSize
                ,long               lStyle = 0
                ,const wxPoint&     rPos = wxDefaultPosition
                ,const wxSize&      rSize = wxDefaultSize
                ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                ,const wxValidator& rValidator = wxDefaultValidator
                ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                ,const wxString&    rsName = wxTextCtrlNameStr
               )
     {
         Create(pParent, vId, rsValue, rPos, rSize, lStyle, rValidator, rsName);
     }
                ,const wxString&    rsName = wxTextCtrlNameStr
               )
     {
         Create(pParent, vId, rsValue, rPos, rSize, lStyle, rValidator, rsName);
     }

+    ~wxTextCtrl();

 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId


@@ -37,9 +38,7 @@ public:
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                 ,const wxValidator& rValidator = wxDefaultValidator
                 ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                 ,const wxString&    rsName = wxTextCtrlNameStr
                );
 
                 ,const wxString&    rsName = wxTextCtrlNameStr
                );
 


@@ -75,10 +74,12 @@ public:
 
     virtual bool LoadFile(const wxString& rsFile);
 
 
     virtual bool LoadFile(const wxString& rsFile);
 

+    virtual void MarkDirty();

     virtual void DiscardEdits(void);
 
     virtual void WriteText(const wxString& rsText);
     virtual void AppendText(const wxString& rsText);
     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
 
     virtual bool SetStyle( long              lStart
                           ,long              lEnd


@@ -111,12 +112,13 @@ public:
     virtual void SetInsertionPoint(long lPos);
     virtual void SetInsertionPointEnd(void);
     virtual long GetInsertionPoint(void) const;
     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 SetSelection( long lFrom
                               ,long lTo
                              );
     virtual void SetEditable(bool bEditable);

+    virtual void SetWindowStyleFlag(long lStyle);

 
     //
     // Implementation from now on
 
     //
     // Implementation from now on


@@ -152,12 +154,16 @@ public:
     void OnPaste(wxCommandEvent& rEvent);
     void OnUndo(wxCommandEvent& rEvent);
     void OnRedo(wxCommandEvent& rEvent);
     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 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;}
 
     inline bool IsMLE(void) {return m_bIsMLE;}
     inline void SetMLE(bool bIsMLE) {m_bIsMLE = bIsMLE;}


@@ -169,7 +175,11 @@ protected:
     //
     void           AdjustSpaceLimit(void);
     virtual wxSize DoGetBestSize(void) const;
     //
     void           AdjustSpaceLimit(void);
     virtual wxSize DoGetBestSize(void) const;

+    virtual bool   OS2ShouldPreProcessMessage(WXMSG* pMsg);

 
 

+    virtual WXDWORD OS2GetStyle( long     lStyle
+                                ,WXDWORD* dwExstyle
+                               ) const;

 private:
     bool                            m_bIsMLE;
     DECLARE_EVENT_TABLE()
 private:
     bool                            m_bIsMLE;
     DECLARE_EVENT_TABLE()