X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e702ff0f08a54622a6b0f1e2ec39537b082c3a8e..c8e1af672f46e93ae2fe6d7f9d5b35a3d8d49c16:/include/wx/motif/textctrl.h

diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h
index 2466ff7376..3eaef48ab7 100644
--- a/include/wx/motif/textctrl.h
+++ b/include/wx/motif/textctrl.h
@@ -12,26 +12,12 @@
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
-#ifdef __GNUG__
-    #pragma interface "textctrl.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#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
-class WXDLLEXPORT wxTextCtrl: public wxControl
-#ifndef NO_TEXT_WINDOW_STREAM
-                            , public streambuf
-#endif
+class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
 {
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 
@@ -40,26 +26,23 @@ public:
     // --------
     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,
-                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
     // ---------
@@ -91,7 +74,7 @@ public:
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;
-    virtual long GetLastPosition() const;
+    virtual wxTextPos 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);
@@ -101,29 +84,14 @@ public:
     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 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();
 
@@ -149,7 +117,7 @@ public:
 
     // 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; }
@@ -157,11 +125,12 @@ public:
 
     // send the CHAR and TEXT_UPDATED events
     void DoSendEvents(void /* XmTextVerifyCallbackStruct */ *cbs,
-                      long keycode);
+        long keycode);
 
 protected:
     wxString  m_fileName;
 
+    virtual wxSize DoGetBestSize() const;
 public:
     // Motif-specific
     void*     m_tempCallbackStruct;
@@ -176,4 +145,4 @@ private:
 };
 
 #endif
-    // _WX_TEXTCTRL_H_
+// _WX_TEXTCTRL_H_