#define HAVE_W32API_H for Cygwin/GCC 3.x, too.

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

diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h
index 48800d842fc0cddac17c9d191395c40e6dc2f3f7..b4408f36e9622f0189d655f4c23fe354c919445d 100644 (file)
--- a/include/wx/os2/textctrl.h
+++ b/include/wx/os2/textctrl.h
@@ -22,14 +22,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 +36,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
                );
 


@@ -79,6 +76,7 @@ public:
 
     virtual void WriteText(const wxString& rsText);
     virtual void AppendText(const wxString& rsText);
 
     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


@@ -153,12 +151,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;}