X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4bf78aae345c474fe75c0d9df43cf3aaeaf75d57..4438caf41af49f00f3c8137ac801871f59cce386:/include/wx/gtk1/textctrl.h

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index da978601d1..a930d772d4 100644
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -29,10 +29,6 @@
 #include <iostream>
 #endif
 
-#else
-
-#define NO_TEXT_WINDOW_STREAM
-
 #endif
 
 //-----------------------------------------------------------------------------
@@ -51,7 +47,7 @@ extern const char *wxTextCtrlNameStr;
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 
-#ifndef NO_TEXT_WINDOW_STREAM
+#if wxUSE_STD_IOSTREAM
 class wxTextCtrl: public wxControl, public streambuf
 #else
 class wxTextCtrl: public wxControl
@@ -73,6 +69,7 @@ class wxTextCtrl: public wxControl
     wxString GetValue() const;
     void SetValue( const wxString &value );
     void WriteText( const wxString &text );
+    void AppendText( const wxString &text );
 
     bool LoadFile( const wxString &file );
     bool SaveFile( const wxString &file );
@@ -99,12 +96,41 @@ class wxTextCtrl: public wxControl
     void Paste();
     void Clear();
 
+    virtual bool CanCopy() const;
+    virtual bool CanCut() const;
+    virtual bool CanPaste() const;
+
+    // Undo/redo
+    virtual void Undo();
+    virtual void Redo();
+
+    virtual bool CanUndo() const;
+    virtual bool CanRedo() const;
+
+    // If the return values from and to are the same, there is no
+    // selection.
+    virtual void GetSelection(long* from, long* to) const;
+    virtual bool IsEditable() const ;
+
     void OnChar( wxKeyEvent &event );
 
-#ifndef NO_TEXT_WINDOW_STREAM
+    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);
+
+#if wxUSE_STD_IOSTREAM
     int overflow(int i);
     int sync();
     int underflow();
+#endif
 
     wxTextCtrl& operator<<(const wxString& s);
     wxTextCtrl& operator<<(int i);
@@ -112,11 +138,10 @@ class wxTextCtrl: public wxControl
     wxTextCtrl& operator<<(float f);
     wxTextCtrl& operator<<(double d);
     wxTextCtrl& operator<<(const char c);
-#endif
 
-    void SetFont( const wxFont &font );
-    void SetForegroundColour(const wxColour &colour);
-    void SetBackgroundColour(const wxColour &colour);
+    bool SetFont( const wxFont &font );
+    bool SetForegroundColour(const wxColour &colour);
+    bool SetBackgroundColour(const wxColour &colour);
 
   // implementation