* Small fix in wxHTTP::BuildRequest

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

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index 061e82e3bd0e86f48a66fd5c94d31fe770e63420..95161e524658b3c449177af2108f74d985f53ccd 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -21,12 +21,20 @@
 #include "wx/string.h"
 #include "wx/control.h"
 
+#if wxUSE_STD_IOSTREAM
+
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #include <iostream>
 #endif
 
+#else
+
+#define NO_TEXT_WINDOW_STREAM
+
+#endif
+
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
@@ -43,7 +51,11 @@ extern const char *wxTextCtrlNameStr;
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 
+#ifndef NO_TEXT_WINDOW_STREAM
 class wxTextCtrl: public wxControl, public streambuf
+#else
+class wxTextCtrl: public wxControl
+#endif
 {
   DECLARE_EVENT_TABLE()
   DECLARE_DYNAMIC_CLASS(wxTextCtrl);
@@ -61,6 +73,7 @@ class wxTextCtrl: public wxControl, public streambuf
     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 );
@@ -87,8 +100,37 @@ class wxTextCtrl: public wxControl, public streambuf
     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 );
 
+    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);
+
+#ifndef NO_TEXT_WINDOW_STREAM
     int overflow(int i);
     int sync();
     int underflow();
@@ -99,10 +141,11 @@ class wxTextCtrl: public wxControl, public streambuf
     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