fix typo in last commit

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

diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h
index 2466ff73764fdc4501cf1b2175cbd136158e65ce..e391854724598cf305b6602730d39005b58c6f14 100644 (file)
--- a/include/wx/motif/textctrl.h
+++ b/include/wx/motif/textctrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        textctrl.h
+// Name:        wx/motif/textctrl.h

 // Purpose:     wxTextCtrl class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxTextCtrl class
 // Author:      Julian Smart
 // Modified by:


@@ -12,32 +12,13 @@
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 

-#ifdef __GNUG__
-    #pragma interface "textctrl.h"
-#endif
-
-#include "wx/control.h"
-#include "wx/ioswrap.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
 // Single-line text item

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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxTextCtrl)
-

 public:
     // creation
     // --------
 public:
     // creation
     // --------

+

     wxTextCtrl();
     wxTextCtrl(wxWindow *parent,
                wxWindowID id,
     wxTextCtrl();
     wxTextCtrl(wxWindow *parent,
                wxWindowID id,


@@ -47,12 +28,9 @@ 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);
+    }

 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& value = wxEmptyString,
 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& value = wxEmptyString,


@@ -64,7 +42,6 @@ public:
     // accessors
     // ---------
     virtual wxString GetValue() const;
     // 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 GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;


@@ -73,59 +50,13 @@ public:
     // operations
     // ----------
 
     // operations
     // ----------
 

-    // Clipboard operations
-    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 long GetInsertionPoint() const;
-    virtual long GetLastPosition() const;
-    virtual void Replace(long from, long to, const wxString& value);
-    virtual void Remove(long from, long to);
-    virtual void SetSelection(long from, long to);
-    virtual void SetEditable(bool editable);
-    // 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 ;
-
-    // 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 MarkDirty();

     virtual void DiscardEdits();
     virtual bool IsModified() const;
 
     virtual long XYToPosition(long x, long y) const;
     virtual void DiscardEdits();
     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 ShowPosition(long pos);

-    virtual void Clear();

 
     // callbacks
     // ---------
 
     // callbacks
     // ---------


@@ -149,7 +80,7 @@ public:
 
     // implementation from here to the end
     // -----------------------------------
 
     // implementation from here to the end
     // -----------------------------------

-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+    virtual void ChangeFont(bool keepOriginalSize = true);

     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     void SetModified(bool mod) { m_modified = mod; }
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     void SetModified(bool mod) { m_modified = mod; }


@@ -160,7 +91,11 @@ public:
                       long keycode);
 
 protected:
                       long keycode);
 
 protected:

-    wxString  m_fileName;
+    virtual wxSize DoGetBestSize() const;
+
+    virtual void DoSetValue(const wxString& value, int flags = 0);
+
+    virtual WXWidget GetTextWidget() const { return m_mainWidget; }

 
 public:
     // Motif-specific
 
 public:
     // Motif-specific


@@ -173,7 +108,8 @@ public:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxTextCtrl)

 };
 
 #endif
 };
 
 #endif

-    // _WX_TEXTCTRL_H_
+// _WX_TEXTCTRL_H_