X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39ca6d790b4629bdacd5ea15e0169aa17fb1d53f..6c00e46fa83e3a9c0e76a76f15522a10b3a5c67f:/include/wx/msw/textctrl.h diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h index 94c365b597..6461338618 100644 --- a/include/wx/msw/textctrl.h +++ b/include/wx/msw/textctrl.h @@ -25,7 +25,7 @@ #include #endif -#if defined(__WIN95__) && !defined(__TWIN32__) +#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__WXWINE__) #define wxUSE_RICHEDIT 1 #else #define wxUSE_RICHEDIT 0 @@ -152,7 +152,6 @@ public: // --------- void OnDropFiles(wxDropFilesEvent& event); void OnChar(wxKeyEvent& event); // Process 'enter' if required - void OnEraseBackground(wxEraseEvent& event); void OnCut(wxCommandEvent& event); void OnCopy(wxCommandEvent& event); @@ -182,7 +181,6 @@ public: virtual void AdoptAttributesFromHWND(); virtual void SetupColours(); - virtual long MSWGetDlgCode(); protected: #if wxUSE_RICHEDIT @@ -191,9 +189,13 @@ protected: wxString m_fileName; + // call this to increase the size limit (will do nothing if the current + // limit is big enough) + void AdjustSpaceLimit(); + virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); + int width, int height, + int sizeFlags = wxSIZE_AUTO); private: DECLARE_EVENT_TABLE()