Removed unnecessary code from utilsunx.cpp

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

diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h
index 091f5e6763cd70e112c5bf993f899374045dfc86..6d0bb105deb05932b47a9989d02ab84bd529c767 100644 (file)
--- a/include/wx/motif/textctrl.h
+++ b/include/wx/motif/textctrl.h
@@ -16,22 +16,11 @@
     #pragma interface "textctrl.h"
 #endif
 
     #pragma interface "textctrl.h"
 #endif
 

-#include "wx/ioswrap.h"
-#include "wx/control.h"
-
-// TODO Some platforms/compilers don't like inheritance from streambuf.
-#if (defined(__BORLANDC__) && !defined(__WIN32__)) || defined(__MWERKS__)
-    #define NO_TEXT_WINDOW_STREAM
-#endif
-

 WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 
 // Single-line text item
 WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 
 // Single-line text item

-class WXDLLEXPORT wxTextCtrl: public wxControl
-#ifndef NO_TEXT_WINDOW_STREAM
-                            , public streambuf
-#endif
+class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase

 {
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 
 {
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 


@@ -47,9 +36,6 @@ public:
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxTextCtrlNameStr)
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxTextCtrlNameStr)

-#ifndef NO_TEXT_WINDOW_STREAM
-        : streambuf()
-#endif

         {
             Create(parent, id, value, pos, size, style, validator, name);
         }
         {
             Create(parent, id, value, pos, size, style, validator, name);
         }


@@ -77,6 +63,16 @@ public:
     virtual void Copy();
     virtual void Cut();
     virtual void Paste();
     virtual void Copy();
     virtual void Cut();
     virtual void Paste();

+    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;

 
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
 
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();


@@ -86,20 +82,10 @@ public:
     virtual void Remove(long from, long to);
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
     virtual void Remove(long from, long to);
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);

-
-    // streambuf implementation
-#ifndef NO_TEXT_WINDOW_STREAM
-    int overflow(int i);
-    int sync();
-    int underflow();
-#endif
-
-    wxTextCtrl& operator<<(const wxString& s);
-    wxTextCtrl& operator<<(int i);
-    wxTextCtrl& operator<<(long i);
-    wxTextCtrl& operator<<(float f);
-    wxTextCtrl& operator<<(double d);
-    wxTextCtrl& operator<<(const char c);
+    // 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 ;

 
     virtual bool LoadFile(const wxString& file);
     virtual bool SaveFile(const wxString& file);
 
     virtual bool LoadFile(const wxString& file);
     virtual bool SaveFile(const wxString& file);


@@ -109,7 +95,7 @@ public:
     virtual bool IsModified() const;
 
     virtual long XYToPosition(long x, long y) const;
     virtual bool IsModified() const;
 
     virtual long XYToPosition(long x, long y) const;

-    virtual void PositionToXY(long pos, long *x, long *y) const;
+    virtual bool PositionToXY(long pos, long *x, long *y) const;

     virtual void ShowPosition(long pos);
     virtual void Clear();
 
     virtual void ShowPosition(long pos);
     virtual void Clear();
 


@@ -119,6 +105,18 @@ public:
     void OnChar(wxKeyEvent& event);
     //  void OnEraseBackground(wxEraseEvent& event);
 
     void OnChar(wxKeyEvent& event);
     //  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);
+

     virtual void Command(wxCommandEvent& event);
 
     // implementation from here to the end
     virtual void Command(wxCommandEvent& event);
 
     // implementation from here to the end