X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae29de8326c957145c6cef1888d35adcff110126..518f33a4e50585cab19757375a2c348e61d2594f:/include/wx/msw/textctrl.h diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h index 23e3e12f7c..5a3c475644 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 #else #include @@ -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_