X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47d67540a017101b3e46abe9ef0f55914d8de37e..7921cf2badfac0c44cd53644bfc6a483a09ec299:/include/wx/msw/textctrl.h diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h index edc0de5b32..3764644be4 100644 --- a/include/wx/msw/textctrl.h +++ b/include/wx/msw/textctrl.h @@ -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 @@ -65,7 +65,7 @@ public: 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); @@ -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();