A few tweaks and cleanups

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

diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h
index 6622976caf5707bc28e75e79fdb8c135b6f43205..7355c8555519ce6250313a298d0bcea556f6f9bf 100644 (file)
--- a/include/wx/motif/textctrl.h
+++ b/include/wx/motif/textctrl.h
@@ -13,66 +13,52 @@
 #define _WX_TEXTCTRL_H_
 
 #ifdef __GNUG__
 #define _WX_TEXTCTRL_H_
 
 #ifdef __GNUG__

-    #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
+#pragma interface "textctrl.h"

 #endif
 
 WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 
 // Single-line text item
 #endif
 
 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)

-
+        

 public:
     // creation
     // --------
     wxTextCtrl();
     wxTextCtrl(wxWindow *parent,
 public:
     // creation
     // --------
     wxTextCtrl();
     wxTextCtrl(wxWindow *parent,

-               wxWindowID id,
-               const wxString& value = wxEmptyString,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               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);
-        }
-
+        wxWindowID id,
+        const wxString& value = wxEmptyString,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxTextCtrlNameStr)
+    {
+        Create(parent, id, value, pos, size, style, validator, name);
+    }
+    

     bool Create(wxWindow *parent, wxWindowID id,
     bool Create(wxWindow *parent, wxWindowID id,

-                const wxString& value = wxEmptyString,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize, long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxTextCtrlNameStr);
-
+        const wxString& value = wxEmptyString,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxTextCtrlNameStr);
+    

     // accessors
     // ---------
     virtual wxString GetValue() const;
     virtual void SetValue(const wxString& value);
     // accessors
     // ---------
     virtual wxString GetValue() const;
     virtual void SetValue(const wxString& value);

-
+    

     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
     virtual int GetNumberOfLines() const;
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
     virtual int GetNumberOfLines() const;

-
+    

     // operations
     // ----------
     // operations
     // ----------

-
+    

     // Clipboard operations
     virtual void Copy();
     virtual void Cut();
     // Clipboard operations
     virtual void Copy();
     virtual void Cut();


@@ -80,14 +66,14 @@ public:
     virtual bool CanCopy() const;
     virtual bool CanCut() const;
     virtual bool CanPaste() const;
     virtual bool CanCopy() const;
     virtual bool CanCut() const;
     virtual bool CanPaste() const;

-
+    

     // Undo/redo
     virtual void Undo();
     virtual void Redo();
     // Undo/redo
     virtual void Undo();
     virtual void Redo();

-
+    

     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;

-
+    

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


@@ -100,41 +86,39 @@ public:
     // selection.
     virtual void GetSelection(long* from, long* to) const;
     virtual bool IsEditable() const ;
     // selection.
     virtual void GetSelection(long* from, long* to) const;
     virtual bool IsEditable() const ;

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

     virtual bool LoadFile(const wxString& file);
     virtual bool SaveFile(const wxString& file);
     virtual void WriteText(const wxString& text);
     virtual void AppendText(const wxString& text);
     virtual void DiscardEdits();
     virtual bool IsModified() const;
     virtual bool LoadFile(const wxString& file);
     virtual bool SaveFile(const wxString& file);
     virtual void WriteText(const wxString& text);
     virtual void AppendText(const wxString& text);
     virtual void DiscardEdits();
     virtual bool IsModified() const;

-
+    

     virtual long XYToPosition(long x, long y) 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();

-
+    

     // callbacks
     // ---------
     void OnDropFiles(wxDropFilesEvent& event);
     void OnChar(wxKeyEvent& event);
     //  void OnEraseBackground(wxEraseEvent& event);
     // callbacks
     // ---------
     void OnDropFiles(wxDropFilesEvent& 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);
     virtual void Command(wxCommandEvent& event);

-
+    

     // implementation from here to the end
     // -----------------------------------
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     // implementation from here to the end
     // -----------------------------------
     virtual void ChangeFont(bool keepOriginalSize = TRUE);


@@ -142,26 +126,26 @@ public:
     virtual void ChangeForegroundColour();
     void SetModified(bool mod) { m_modified = mod; }
     virtual WXWidget GetTopWidget() const;
     virtual void ChangeForegroundColour();
     void SetModified(bool mod) { m_modified = mod; }
     virtual WXWidget GetTopWidget() const;

-
+    

     // send the CHAR and TEXT_UPDATED events
     void DoSendEvents(void /* XmTextVerifyCallbackStruct */ *cbs,
     // send the CHAR and TEXT_UPDATED events
     void DoSendEvents(void /* XmTextVerifyCallbackStruct */ *cbs,

-                      long keycode);
-
+        long keycode);
+    

 protected:
     wxString  m_fileName;
 protected:
     wxString  m_fileName;

-
+    

 public:
     // Motif-specific
     void*     m_tempCallbackStruct;
     bool      m_modified;
     wxString  m_value;            // Required for password text controls
 public:
     // Motif-specific
     void*     m_tempCallbackStruct;
     bool      m_modified;
     wxString  m_value;            // Required for password text controls

-
+    

     // Did we call wxTextCtrl::OnChar? If so, generate a command event.
     bool      m_processedDefault;
     // Did we call wxTextCtrl::OnChar? If so, generate a command event.
     bool      m_processedDefault;

-
+    

 private:
     DECLARE_EVENT_TABLE()
 };
 
 #endif
 private:
     DECLARE_EVENT_TABLE()
 };
 
 #endif

-    // _WX_TEXTCTRL_H_
+// _WX_TEXTCTRL_H_