projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reflect changes in stc.cpp in stc.cpp.in from which it's generated.
[wxWidgets.git]
/
src
/
xrc
/
xh_text.cpp
diff --git
a/src/xrc/xh_text.cpp
b/src/xrc/xh_text.cpp
index fa824f48cbbfce3f84d5c611f26fb5e632f82751..284e9b00f3f7110fcf8211d7d5ccd93bc9c76a93 100644
(file)
--- a/
src/xrc/xh_text.cpp
+++ b/
src/xrc/xh_text.cpp
@@
-3,7
+3,6
@@
// Purpose: XRC resource for wxTextCtrl
// Author: Aleksandras Gluchovas
// Created: 2000/03/21
// Purpose: XRC resource for wxTextCtrl
// Author: Aleksandras Gluchovas
// Created: 2000/03/21
-// RCS-ID: $Id$
// Copyright: (c) 2000 Aleksandras Gluchovas
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 2000 Aleksandras Gluchovas
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@
-15,17
+14,19
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#if wxUSE_XRC
+#if wxUSE_XRC
&& wxUSE_TEXTCTRL
#include "wx/xrc/xh_text.h"
#include "wx/xrc/xh_text.h"
-#include "wx/textctrl.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/textctrl.h"
+#endif
IMPLEMENT_DYNAMIC_CLASS(wxTextCtrlXmlHandler, wxXmlResourceHandler)
wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler()
{
XRC_ADD_STYLE(wxTE_NO_VSCROLL);
IMPLEMENT_DYNAMIC_CLASS(wxTextCtrlXmlHandler, wxXmlResourceHandler)
wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler()
{
XRC_ADD_STYLE(wxTE_NO_VSCROLL);
- XRC_ADD_STYLE(wxTE_AUTO_SCROLL);
XRC_ADD_STYLE(wxTE_PROCESS_ENTER);
XRC_ADD_STYLE(wxTE_PROCESS_TAB);
XRC_ADD_STYLE(wxTE_MULTILINE);
XRC_ADD_STYLE(wxTE_PROCESS_ENTER);
XRC_ADD_STYLE(wxTE_PROCESS_TAB);
XRC_ADD_STYLE(wxTE_MULTILINE);
@@
-45,6
+46,12
@@
wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler()
#endif // WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxTE_CHARWRAP);
XRC_ADD_STYLE(wxTE_WORDWRAP);
#endif // WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxTE_CHARWRAP);
XRC_ADD_STYLE(wxTE_WORDWRAP);
+
+ // this style doesn't exist since wx 2.9.0 but we still support it (by
+ // ignoring it silently) in XRC files to avoid unimportant warnings when
+ // using XRC produced by old tools
+ AddStyle(wxT("wxTE_AUTO_SCROLL"), 0);
+
AddWindowStyles();
}
AddWindowStyles();
}
@@
-73,4
+80,4
@@
bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxTextCtrl"));
}
return IsOfClass(node, wxT("wxTextCtrl"));
}
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC
&& wxUSE_TEXTCTRL