Made wxGTK compile and link again. Broke wxMSW a little.

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

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index af31bad26ff011eea8808d976ec2a8e94e4c19cb..00675d4c95e08ac141d67300ed7a654bb0888f5f 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -16,70 +16,41 @@
     #pragma interface "textctrl.h"
 #endif
 
     #pragma interface "textctrl.h"
 #endif
 

-#include "wx/setup.h"
-#include "wx/control.h"
-
-#if wxUSE_IOSTREAMH
-    #include <iostream.h>
-#else
-    #include <iostream>
-#endif
-
+// can we use RICHEDIT class for wxTextCtrl implementation?

 #if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__WXWINE__)
     #define wxUSE_RICHEDIT 1
 #else
     #define wxUSE_RICHEDIT 0
 #endif
 
 #if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__WXWINE__)
     #define wxUSE_RICHEDIT 1
 #else
     #define wxUSE_RICHEDIT 0
 #endif
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
-
-// Single-line text item
-class WXDLLEXPORT wxTextCtrl : public wxControl
-
-// 16-bit Borland 4.0 doesn't seem to allow multiple inheritance with wxWindow and streambuf:
-// it complains about deriving a huge class from the huge class streambuf. !!
-// Also, can't use streambuf if making or using a DLL :-(
-
-#if (defined(__BORLANDC__)) || defined(__MWERKS__) || defined(_WINDLL) || defined(WXUSINGDLL) || defined(WXMAKINGDLL)
-#define NO_TEXT_WINDOW_STREAM
-#endif
-
-#ifndef NO_TEXT_WINDOW_STREAM
-, public streambuf
-#endif
-
+class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxTextCtrl)
-

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

+

     wxTextCtrl();
     wxTextCtrl(wxWindow *parent, wxWindowID id,
     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);
-        }
+               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
-    // ---------
+    // implement base class pure virtuals
+    // ----------------------------------

 
     virtual wxString GetValue() const;
     virtual void SetValue(const wxString& value);
 
     virtual wxString GetValue() const;
     virtual void SetValue(const wxString& value);


@@ -88,9 +59,39 @@ public:
     virtual wxString GetLineText(long lineNo) const;
     virtual int GetNumberOfLines() const;
 
     virtual wxString GetLineText(long lineNo) const;
     virtual int GetNumberOfLines() const;
 

+    virtual bool IsModified() const;
+    virtual bool IsEditable() const;
+
+    // If the return values from and to are the same, there is no selection.
+    virtual void GetSelection(long* from, long* to) const;
+

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

+    // editing
+    virtual void Clear();
+    virtual void Replace(long from, long to, const wxString& value);
+    virtual void Remove(long from, long to);
+
+    // load the controls contents from the file
+    virtual bool LoadFile(const wxString& file);
+
+    // clears the dirty flag
+    virtual void DiscardEdits();
+
+    // writing text inserts it at the current position, appending always
+    // inserts it at the end
+    virtual void WriteText(const wxString& text);
+    virtual void AppendText(const wxString& text);
+
+    // translate between the position (which is just an index in the text ctrl
+    // considering all its contents as a single strings) and (x, y) coordinates
+    // which represent column and line.
+    virtual long XYToPosition(long x, long y) const;
+    virtual bool PositionToXY(long pos, long *x, long *y) const;
+
+    virtual void ShowPosition(long pos);
+

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


@@ -107,50 +108,15 @@ public:
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
 
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
 

+    // Insertion point

     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     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 long GetInsertionPoint() const;
+    virtual long GetLastPosition() const;
+

     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
 
     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 DiscardEdits();
-    virtual bool IsModified() const;
-
-#if WXWIN_COMPATIBILITY
-    inline bool Modified() const { return IsModified(); }
-#endif
-
-    virtual long XYToPosition(long x, long y) const ;
-    virtual void PositionToXY(long pos, long *x, long *y) const ;
-    virtual void ShowPosition(long pos);
-    virtual void Clear();
-

     // Implementation from now on
     // --------------------------
 
     // Implementation from now on
     // --------------------------
 


@@ -160,11 +126,11 @@ public:
 #if wxUSE_RICHEDIT
     bool IsRich() const { return m_isRich; }
     void SetRichEdit(bool isRich) { m_isRich = isRich; }
 #if wxUSE_RICHEDIT
     bool IsRich() const { return m_isRich; }
     void SetRichEdit(bool isRich) { m_isRich = isRich; }

-#endif
+#endif // wxUSE_RICHEDIT

 
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
 
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

-            WXUINT message, WXWPARAM wParam,
-            WXLPARAM lParam);
+                                WXUINT message, WXWPARAM wParam,
+                                WXLPARAM lParam);

 
     virtual void AdoptAttributesFromHWND();
     virtual void SetupColours();
 
     virtual void AdoptAttributesFromHWND();
     virtual void SetupColours();


@@ -172,7 +138,6 @@ public:
     virtual bool AcceptsFocus() const;
 
     // callbacks
     virtual bool AcceptsFocus() const;
 
     // callbacks

-    // ---------

     void OnDropFiles(wxDropFilesEvent& event);
     void OnChar(wxKeyEvent& event); // Process 'enter' if required
 
     void OnDropFiles(wxDropFilesEvent& event);
     void OnChar(wxKeyEvent& event); // Process 'enter' if required
 


@@ -193,8 +158,6 @@ protected:
     bool      m_isRich; // Are we using rich text edit to implement this?
 #endif
 
     bool      m_isRich; // Are we using rich text edit to implement this?
 #endif
 

-    wxString  m_fileName;
-

     // call this to increase the size limit (will do nothing if the current
     // limit is big enough)
     void AdjustSpaceLimit();
     // call this to increase the size limit (will do nothing if the current
     // limit is big enough)
     void AdjustSpaceLimit();


@@ -203,6 +166,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxTextCtrl)

 };
 
 #endif
 };
 
 #endif