_MSC_VER => __VISUALC__ change

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

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index edc0de5b329c4bd979e5f3bc656d41516ae7f23c..83cedeaffe2b64da9d2fae5b0539f8b050cf498a 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -6,22 +6,29 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
 #ifdef __GNUG__
-#pragma interface "textctrl.h"
+    #pragma interface "textctrl.h"
 #endif
 
+#include "wx/setup.h"
 #include "wx/control.h"
 
 #if wxUSE_IOSTREAMH
-#include <iostream.h>
+    #include <iostream.h>
 #else
-#include <iostream>
+    #include <iostream>
+#endif
+
+#if defined(__WIN95__) && !defined(__TWIN32__)
+    #define wxUSE_RICHEDIT 1
+#else
+    #define wxUSE_RICHEDIT 0
 #endif
 
 WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr;
@@ -34,7 +41,7 @@ class WXDLLEXPORT wxTextCtrl: public wxControl
 // 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(__WIN32__)) || defined(__MWERKS__) || defined(_WINDLL) || defined(WXUSINGDLL) || defined(WXMAKINGDLL)
+#if (defined(__BORLANDC__)) || defined(__MWERKS__) || defined(_WINDLL) || defined(WXUSINGDLL) || defined(WXMAKINGDLL)
 #define NO_TEXT_WINDOW_STREAM
 #endif
 
@@ -44,7 +51,7 @@ class WXDLLEXPORT wxTextCtrl: public wxControl
 
 {
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)
-    
+
 public:
   // creation
   // --------
@@ -61,14 +68,14 @@ public:
   {
     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 wxSize& size = wxDefaultSize, long style = wxTE_PROCESS_TAB,
               const wxValidator& validator = wxDefaultValidator,
               const wxString& name = wxTextCtrlNameStr);
-  
+
   // accessors
   // ---------
   virtual wxString GetValue() const ;
@@ -81,12 +88,15 @@ public:
   // operations
   // ----------
   virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  
+  void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
+    { wxWindow::SetSize(rect, sizeFlags); }
+  void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
+
   // Clipboard operations
   virtual void Copy();
   virtual void Cut();
   virtual void Paste();
-  
+
   virtual void SetInsertionPoint(long pos);
   virtual void SetInsertionPointEnd();
   virtual long GetInsertionPoint() const ;
@@ -95,60 +105,68 @@ public:
   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);
-  
+
   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();
-  
+
   // callbacks
   // ---------
   void OnDropFiles(wxDropFilesEvent& event);
   void OnChar(wxKeyEvent& event); // Process 'enter' if required
   void OnEraseBackground(wxEraseEvent& event);
-  
+
   // Implementation
   // --------------
   virtual void Command(wxCommandEvent& event);
   virtual bool MSWCommand(WXUINT param, WXWORD id);
-  inline bool IsRich() const { return m_isRich; }
-  inline void SetRichEdit(bool isRich) { m_isRich = isRich; }
+
+#if wxUSE_RICHEDIT
+  bool IsRich() const { return m_isRich; }
+  void SetRichEdit(bool isRich) { m_isRich = isRich; }
+#endif
+
   virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                               WXUINT message, WXWPARAM wParam,
                               WXLPARAM lParam);
-  
+
   virtual void AdoptAttributesFromHWND();
   virtual void SetupColours();
   virtual long MSWGetDlgCode();
-  
+
 protected:
+#if wxUSE_RICHEDIT
   bool      m_isRich; // Are we using rich text edit to implement this?
+#endif
+
   wxString  m_fileName;
-  
+
   DECLARE_EVENT_TABLE()
 };