X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b823f5a145f4823ce823591824855c34204936e4..9bd6a5037aa30e8fa46466509aee18abd14318a0:/include/wx/msw/textctrl.h diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h index 44928ded07..4da1c0f7d3 100644 --- a/include/wx/msw/textctrl.h +++ b/include/wx/msw/textctrl.h @@ -13,15 +13,22 @@ #define _WX_TEXTCTRL_H_ #ifdef __GNUG__ -#pragma interface "textctrl.h" + #pragma interface "textctrl.h" #endif +#include "wx/setup.h" #include "wx/control.h" -#if USE_IOSTREAMH -#include +#if wxUSE_IOSTREAMH + #include #else -#include + #include +#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 @@ -65,7 +72,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 +88,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(); @@ -135,8 +145,12 @@ public: // -------------- 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); @@ -146,7 +160,10 @@ public: 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()