Some #include and #if wxUSE_XX things

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

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index cc3ad2a303a7c58f7cdbe306b9e2ce8f8ef33410..95161e524658b3c449177af2108f74d985f53ccd 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -21,7 +21,7 @@
 #include "wx/string.h"
 #include "wx/control.h"
 
 #include "wx/string.h"
 #include "wx/control.h"
 

-#ifdef wxUSE_STD_IOSTREAM
+#if wxUSE_STD_IOSTREAM

 
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 
 #if wxUSE_IOSTREAMH
 #include <iostream.h>


@@ -73,6 +73,7 @@ class wxTextCtrl: public wxControl
     wxString GetValue() const;
     void SetValue( const wxString &value );
     void WriteText( const wxString &text );
     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 );
 
     bool LoadFile( const wxString &file );
     bool SaveFile( const wxString &file );


@@ -99,8 +100,36 @@ class wxTextCtrl: public wxControl
     void Paste();
     void Clear();
 
     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 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();
 #ifndef NO_TEXT_WINDOW_STREAM
     int overflow(int i);
     int sync();


@@ -114,9 +143,9 @@ class wxTextCtrl: public wxControl
     wxTextCtrl& operator<<(const char c);
 #endif
 
     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    
     
 
   // implementation