Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxCheckList -> wxCheckListBox

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-28 09:36:54 +00:00
parent 5eace63e83
commit c14dc56ac0
8 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@@ -24,18 +24,22 @@
#include "wx/xrc/xh_chckl.h" #include "wx/xrc/xh_chckl.h"
#include "wx/checklst.h" #include "wx/checklst.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h"
wxCheckListXmlHandler::wxCheckListXmlHandler() wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler()
: wxXmlResourceHandler(), m_insideBox(FALSE) : wxXmlResourceHandler(), m_insideBox(FALSE)
{ {
// no styles // no styles
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxCheckListXmlHandler::DoCreateResource() wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
{
if (m_class == wxT("wxCheckListBox") || m_class == wxT("wxCheckList"))
{ {
if (m_class == wxT("wxCheckList")) if (m_class == wxT("wxCheckList"))
{ wxLogDebug(wxT("'wxCheckList' name is deprecated, use 'wxCheckListBox' instead."));
// 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"))); CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
@@ -101,9 +105,10 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
} }
} }
bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node) bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)
{ {
return (IsOfClass(node, wxT("wxCheckList")) || return (IsOfClass(node, wxT("wxCheckListBox")) ||
IsOfClass(node, wxT("wxCheckList")) /*backward compatibility*/ ||
(m_insideBox && node->GetName() == wxT("item"))); (m_insideBox && node->GetName() == wxT("item")));
} }

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

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

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

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

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

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

15
src/xrc/xh_chckl.cpp
View File

@@ -24,18 +24,22 @@
#include "wx/xrc/xh_chckl.h" #include "wx/xrc/xh_chckl.h"
#include "wx/checklst.h" #include "wx/checklst.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h"
wxCheckListXmlHandler::wxCheckListXmlHandler() wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler()
: wxXmlResourceHandler(), m_insideBox(FALSE) : wxXmlResourceHandler(), m_insideBox(FALSE)
{ {
// no styles // no styles
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxCheckListXmlHandler::DoCreateResource() wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
{
if (m_class == wxT("wxCheckListBox") || m_class == wxT("wxCheckList"))
{ {
if (m_class == wxT("wxCheckList")) if (m_class == wxT("wxCheckList"))
{ wxLogDebug(wxT("'wxCheckList' name is deprecated, use 'wxCheckListBox' instead."));
// 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"))); CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
@@ -101,9 +105,10 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
} }
} }
bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node) bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)
{ {
return (IsOfClass(node, wxT("wxCheckList")) || return (IsOfClass(node, wxT("wxCheckListBox")) ||
IsOfClass(node, wxT("wxCheckList")) /*backward compatibility*/ ||
(m_insideBox && node->GetName() == wxT("item"))); (m_insideBox && node->GetName() == wxT("item")));
} }

2
src/xrc/xmlrsall.cpp
View File

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