projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
initialize m_backgroundBrush to an invalid brush instead of wxTRANSPARENT_BRUSH,...
[wxWidgets.git]
/
src
/
xrc
/
xh_text.cpp
diff --git
a/src/xrc/xh_text.cpp
b/src/xrc/xh_text.cpp
index 745189008dec2f598a113873fa6f2e1eddaf6e7f..e369cb4f790662e8511c19bf276949d9a6f5c30d 100644
(file)
--- a/
src/xrc/xh_text.cpp
+++ b/
src/xrc/xh_text.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_text.cpp
+// Name:
src/xrc/
xh_text.cpp
// Purpose: XRC resource for wxTextCtrl
// Author: Aleksandras Gluchovas
// Created: 2000/03/21
// Purpose: XRC resource for wxTextCtrl
// Author: Aleksandras Gluchovas
// Created: 2000/03/21
@@
-8,10
+8,6
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "xh_text.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-19,10
+15,13
@@
#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)
IMPLEMENT_DYNAMIC_CLASS(wxTextCtrlXmlHandler, wxXmlResourceHandler)
@@
-44,7
+43,10
@@
wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler()
XRC_ADD_STYLE(wxTE_CENTRE);
XRC_ADD_STYLE(wxTE_RIGHT);
XRC_ADD_STYLE(wxTE_DONTWRAP);
XRC_ADD_STYLE(wxTE_CENTRE);
XRC_ADD_STYLE(wxTE_RIGHT);
XRC_ADD_STYLE(wxTE_DONTWRAP);
+#if WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxTE_LINEWRAP);
XRC_ADD_STYLE(wxTE_LINEWRAP);
+#endif // WXWIN_COMPATIBILITY_2_6
+ XRC_ADD_STYLE(wxTE_CHARWRAP);
XRC_ADD_STYLE(wxTE_WORDWRAP);
AddWindowStyles();
}
XRC_ADD_STYLE(wxTE_WORDWRAP);
AddWindowStyles();
}
@@
-63,6
+65,9
@@
wxObject *wxTextCtrlXmlHandler::DoCreateResource()
SetupWindow(text);
SetupWindow(text);
+ if (HasParam(wxT("maxlength")))
+ text->SetMaxLength(GetLong(wxT("maxlength")));
+
return text;
}
return text;
}
@@
-71,4
+76,4
@@
bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxTextCtrl"));
}
return IsOfClass(node, wxT("wxTextCtrl"));
}
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC
&& wxUSE_TEXTCTRL