X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae29de8326c957145c6cef1888d35adcff110126..618512fe10b1ba8dbff1482aba403b615f626cc4:/include/wx/msw/textctrl.h

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index 23e3e12f7c..6999805922 100644
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __TEXTCTRLH__
-#define __TEXTCTRLH__
+#ifndef _WX_TEXTCTRL_H_
+#define _WX_TEXTCTRL_H_
 
 #ifdef __GNUG__
 #pragma interface "textctrl.h"
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #include <iostream>
@@ -34,7 +34,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
 
@@ -81,6 +81,9 @@ 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();
@@ -147,10 +150,10 @@ public:
   
 protected:
   bool      m_isRich; // Are we using rich text edit to implement this?
-  wxString  fileName;
+  wxString  m_fileName;
   
   DECLARE_EVENT_TABLE()
 };
 
 #endif
-    // __TEXTCTRLH__
+    // _WX_TEXTCTRL_H_