projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxSYS_COLOUR_WINDOW is better for window backgrounds on PPC/Smartphone
[wxWidgets.git]
/
src
/
xrc
/
xh_chckl.cpp
diff --git
a/src/xrc/xh_chckl.cpp
b/src/xrc/xh_chckl.cpp
index 18e1d028288aa788698aff68e7ec81c88c984c9f..8ed6fef709096e4f11a208f0b9b392c03e6f4c34 100644
(file)
--- a/
src/xrc/xh_chckl.cpp
+++ b/
src/xrc/xh_chckl.cpp
@@
-7,8
+7,8
@@
// Copyright: (c) 2000 Bob Mitchell and Verant Interactive
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 2000 Bob Mitchell and Verant Interactive
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#if
def __GNUG__
+
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "xh_chckl.h"
#endif
#pragma implementation "xh_chckl.h"
#endif
@@
-19,25
+19,46
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
+#if wxUSE_XRC
+
#if wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
#include "wx/xrc/xh_chckl.h"
#include "wx/checklst.h"
#include "wx/intl.h"
#if wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
#include "wx/xrc/xh_chckl.h"
#include "wx/checklst.h"
#include "wx/intl.h"
+#include "wx/log.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
-wxCheckList
XmlHandler::wxCheckListXmlHandler()
-: wxXmlResourceHandler(), m_insideBox(
FALSE
)
+wxCheckList
BoxXmlHandler::wxCheckListBoxXmlHandler()
+: wxXmlResourceHandler(), m_insideBox(
false
)
{
{
- // no styles
+ // wxListBox styles:
+ XRC_ADD_STYLE(wxLB_SINGLE);
+ XRC_ADD_STYLE(wxLB_MULTIPLE);
+ XRC_ADD_STYLE(wxLB_EXTENDED);
+ XRC_ADD_STYLE(wxLB_HSCROLL);
+ XRC_ADD_STYLE(wxLB_ALWAYS_SB);
+ XRC_ADD_STYLE(wxLB_NEEDED_SB);
+ XRC_ADD_STYLE(wxLB_SORT);
+
AddWindowStyles();
}
AddWindowStyles();
}
-wxObject *wxCheckListXmlHandler::DoCreateResource()
-{
- if (m_class == wxT("wxCheckList"))
+wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
+{
+ if (m_class == wxT("wxCheckListBox")
+#if WXWIN_COMPATIBILITY_2_4
+ || m_class == wxT("wxCheckList")
+#endif
+ )
{
{
+#if WXWIN_COMPATIBILITY_2_4
+ if (m_class == wxT("wxCheckList"))
+ wxLogDebug(wxT("'wxCheckList' name is deprecated, use 'wxCheckListBox' instead."));
+#endif
// need to build the list of strings from children
// need to build the list of strings from children
- m_insideBox =
TRUE
;
+ m_insideBox =
true
;
CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
wxString *strings = (wxString *) NULL;
if (strList.GetCount() > 0)
CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
wxString *strings = (wxString *) NULL;
if (strList.GetCount() > 0)
@@
-73,17
+94,17
@@
wxObject *wxCheckListXmlHandler::DoCreateResource()
wxString v = n->GetPropVal(wxT("checked"), wxEmptyString);
v.MakeLower();
if (v && v == wxT("1"))
wxString v = n->GetPropVal(wxT("checked"), wxEmptyString);
v.MakeLower();
if (v && v == wxT("1"))
- control->Check( i,
TRUE
);
+ control->Check( i,
true
);
- i++;
+ i++;
n = n->GetNext();
}
n = n->GetNext();
}
-
+
SetupWindow(control);
if (strings != NULL)
delete[] strings;
SetupWindow(control);
if (strings != NULL)
delete[] strings;
- strList.Clear(); // dump the strings
+ strList.Clear(); // dump the strings
return control;
}
return control;
}
@@
-101,11
+122,15
@@
wxObject *wxCheckListXmlHandler::DoCreateResource()
}
}
}
}
-bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node)
+bool wxCheckList
Box
XmlHandler::CanHandle(wxXmlNode *node)
{
{
- return (IsOfClass(node, wxT("wxCheckList")) ||
+ return (IsOfClass(node, wxT("wxCheckListBox")) ||
+#if WXWIN_COMPATIBILITY_2_4
+ IsOfClass(node, wxT("wxCheckList")) ||
+#endif
(m_insideBox && node->GetName() == wxT("item")));
}
(m_insideBox && node->GetName() == wxT("item")));
}
-#endif
+#endif
// wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
+#endif // wxUSE_XRC