X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca8b28f2efff34b9939035a7aeb1de1e3ac98a0c..6c00e46fa83e3a9c0e76a76f15522a10b3a5c67f:/include/wx/msw/textctrl.h

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index 142ee8ba49..6461338618 100644
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -25,14 +25,14 @@
     #include <iostream>
 #endif
 
-#if defined(__WIN95__) && !defined(__TWIN32__)
+#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__WXWINE__)
     #define wxUSE_RICHEDIT 1
 #else
     #define wxUSE_RICHEDIT 0
 #endif
 
-WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 // Single-line text item
 class WXDLLEXPORT wxTextCtrl : public wxControl
@@ -152,7 +152,18 @@ public:
     // ---------
     void OnDropFiles(wxDropFilesEvent& event);
     void OnChar(wxKeyEvent& event); // Process 'enter' if required
-    void OnEraseBackground(wxEraseEvent& event);
+
+    void OnCut(wxCommandEvent& event);
+    void OnCopy(wxCommandEvent& event);
+    void OnPaste(wxCommandEvent& event);
+    void OnUndo(wxCommandEvent& event);
+    void OnRedo(wxCommandEvent& event);
+
+    void OnUpdateCut(wxUpdateUIEvent& event);
+    void OnUpdateCopy(wxUpdateUIEvent& event);
+    void OnUpdatePaste(wxUpdateUIEvent& event);
+    void OnUpdateUndo(wxUpdateUIEvent& event);
+    void OnUpdateRedo(wxUpdateUIEvent& event);
 
     // Implementation
     // --------------
@@ -170,7 +181,6 @@ public:
 
     virtual void AdoptAttributesFromHWND();
     virtual void SetupColours();
-    virtual long MSWGetDlgCode();
 
 protected:
 #if wxUSE_RICHEDIT
@@ -179,9 +189,13 @@ protected:
 
     wxString  m_fileName;
 
+    // call this to increase the size limit (will do nothing if the current
+    // limit is big enough)
+    void AdjustSpaceLimit();
+
     virtual void DoSetSize(int x, int y,
-            int width, int height,
-            int sizeFlags = wxSIZE_AUTO);
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
 
 private:
     DECLARE_EVENT_TABLE()