AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wxCheckList -> wxCheckListBox

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-08-28 09:36:54 +00:00
parent 036971cc8c
commit 56572188ee
8 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/include/wx/xrc/xh_chckl.h
View File

@ -17,11 +17,11 @@
#include "wx/xrc/xmlres.h"
class WXDLLIMPEXP_XRC wxCheckListXmlHandler : public wxXmlResourceHandler
class WXDLLIMPEXP_XRC wxCheckListBoxXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxCheckListXmlHandler)
DECLARE_DYNAMIC_CLASS(wxCheckListBoxXmlHandler)
public:
wxCheckListXmlHandler();
wxCheckListBoxXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
private:

4
contrib/samples/xrc/rc/controls.xrc
View File

@ -130,7 +130,7 @@
</object>
</object>
<object class="notebookpage">
<label>wxCheckList</label>
<label>wxCheckListBox</label>
<object class="wxPanel" name="checklist">
<object class="wxFlexGridSizer">
<cols>1</cols>
@ -142,7 +142,7 @@
<object class="sizeritem">
<flag>wxALIGN_CENTRE|wxALL</flag>
<border>5</border>
<object class="wxCheckList" name="conrols_checklist">
<object class="wxCheckListBox" name="conrols_checklist">
<size>180,180</size>
<content>
<item checked="1">Download library</item>

24
contrib/src/xrc/xh_chckl.cpp
View File

@ -24,20 +24,29 @@
#include "wx/xrc/xh_chckl.h"
#include "wx/checklst.h"
#include "wx/intl.h"
#include "wx/log.h"
IMPLEMENT_DYNAMIC_CLASS(wxCheckListXmlHandler, wxXmlResourceHandler)
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
wxCheckListXmlHandler::wxCheckListXmlHandler()
wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler()
: wxXmlResourceHandler(), m_insideBox(FALSE)
{
// no styles
AddWindowStyles();
}
wxObject *wxCheckListXmlHandler::DoCreateResource()
wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
{
if (m_class == wxT("wxCheckList"))
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
m_insideBox = TRUE;
CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
@ -103,9 +112,12 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
}
}
bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node)
bool wxCheckListBoxXmlHandler::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")));
}

2
contrib/src/xrc/xmlrsall.cpp
View File

@ -43,7 +43,7 @@ void wxXmlResource::InitAllHandlers()
#endif
AddHandler(new wxListCtrlXmlHandler);
#if wxUSE_CHECKLISTBOX
AddHandler(new wxCheckListXmlHandler);
AddHandler(new wxCheckListBoxXmlHandler);
#endif
#if wxUSE_CHOICE
AddHandler(new wxChoiceXmlHandler);

6
include/wx/xrc/xh_chckl.h
View File

@ -17,11 +17,11 @@
#include "wx/xrc/xmlres.h"
class WXDLLIMPEXP_XRC wxCheckListXmlHandler : public wxXmlResourceHandler
class WXDLLIMPEXP_XRC wxCheckListBoxXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxCheckListXmlHandler)
DECLARE_DYNAMIC_CLASS(wxCheckListBoxXmlHandler)
public:
wxCheckListXmlHandler();
wxCheckListBoxXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
private:

4
samples/xrc/rc/controls.xrc
View File

@ -130,7 +130,7 @@
</object>
</object>
<object class="notebookpage">
<label>wxCheckList</label>
<label>wxCheckListBox</label>
<object class="wxPanel" name="checklist">
<object class="wxFlexGridSizer">
<cols>1</cols>
@ -142,7 +142,7 @@
<object class="sizeritem">
<flag>wxALIGN_CENTRE|wxALL</flag>
<border>5</border>
<object class="wxCheckList" name="conrols_checklist">
<object class="wxCheckListBox" name="conrols_checklist">
<size>180,180</size>
<content>
<item checked="1">Download library</item>

24
src/xrc/xh_chckl.cpp
View File

@ -24,20 +24,29 @@
#include "wx/xrc/xh_chckl.h"
#include "wx/checklst.h"
#include "wx/intl.h"
#include "wx/log.h"
IMPLEMENT_DYNAMIC_CLASS(wxCheckListXmlHandler, wxXmlResourceHandler)
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
wxCheckListXmlHandler::wxCheckListXmlHandler()
wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler()
: wxXmlResourceHandler(), m_insideBox(FALSE)
{
// no styles
AddWindowStyles();
}
wxObject *wxCheckListXmlHandler::DoCreateResource()
wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
{
if (m_class == wxT("wxCheckList"))
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
m_insideBox = TRUE;
CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
@ -103,9 +112,12 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
}
}
bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node)
bool wxCheckListBoxXmlHandler::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")));
}

2
src/xrc/xmlrsall.cpp
View File

@ -43,7 +43,7 @@ void wxXmlResource::InitAllHandlers()
#endif
AddHandler(new wxListCtrlXmlHandler);
#if wxUSE_CHECKLISTBOX
AddHandler(new wxCheckListXmlHandler);
AddHandler(new wxCheckListBoxXmlHandler);
#endif
#if wxUSE_CHOICE
AddHandler(new wxChoiceXmlHandler);