projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing dangling includes
[wxWidgets.git]
/
src
/
xrc
/
xh_chckl.cpp
diff --git
a/src/xrc/xh_chckl.cpp
b/src/xrc/xh_chckl.cpp
index c9f114ea92d54db8923a0848668af5a7a7f3ebbd..a633b112a9a62498f88981f61d52784099862470 100644
(file)
--- a/
src/xrc/xh_chckl.cpp
+++ b/
src/xrc/xh_chckl.cpp
@@
-1,16
+1,12
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_chckl.cpp
-// Purpose: XRC resource for wxCheckList
+// Name:
src/xrc/
xh_chckl.cpp
+// Purpose: XRC resource for wxCheckList
Box
// Author: Bob Mitchell
// Created: 2000/03/21
// RCS-ID: $Id$
// Copyright: (c) 2000 Bob Mitchell and Verant Interactive
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Author: Bob Mitchell
// Created: 2000/03/21
// RCS-ID: $Id$
// Copyright: (c) 2000 Bob Mitchell and Verant Interactive
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "xh_chckl.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,46
+15,55
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
+#if wxUSE_XRC && wxUSE_CHECKLISTBOX
+
#include "wx/xrc/xh_chckl.h"
#include "wx/xrc/xh_chckl.h"
-#include "wx/checklst.h"
-wxCheckListXmlHandler::wxCheckListXmlHandler()
-: wxXmlResourceHandler(), m_insideBox(FALSE)
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/checklst.h"
+#endif
+
+IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
+
+wxCheckListBoxXmlHandler::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 *wxCheckList
Box
XmlHandler::DoCreateResource()
+{
+ if (m_class == wxT("wxCheckList
Box
"))
{
// 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")));
- wxString *strings = (wxString *) NULL;
- if( strList.GetCount() > 0 )
- {
- strings = new wxString[strList.GetCount()];
- int count = strList.GetCount();
- for( int i = 0; i < count; i++ )
- strings[i]=strList[i];
- }
+ XRC_MAKE_INSTANCE(control, wxCheckListBox)
- wxCheckListBox *control = new wxCheckListBox(m_parentAsWindow,
- GetID(),
- GetPosition(), GetSize(),
- strList.GetCount(),
- strings,
- GetStyle(),
- wxDefaultValidator,
- GetName()
- );
+ control->Create(m_parentAsWindow,
+ GetID(),
+ GetPosition(), GetSize(),
+ strList,
+ GetStyle(),
+ wxDefaultValidator,
+ GetName());
// step through children myself (again.)
wxXmlNode *n = GetParamNode(wxT("content"));
// step through children myself (again.)
wxXmlNode *n = GetParamNode(wxT("content"));
- if (n) n = n->GetChildren();
+ if (n)
+ n = n->GetChildren();
int i = 0;
while (n)
{
int i = 0;
while (n)
{
@@
-67,20
+72,18
@@
wxObject *wxCheckListXmlHandler::DoCreateResource()
{ n = n->GetNext(); continue; }
// checking boolean is a bit ugly here (see GetBool() )
{ n = n->GetNext(); continue; }
// checking boolean is a bit ugly here (see GetBool() )
- wxString v = n->Get
PropVal
(wxT("checked"), wxEmptyString);
+ wxString v = n->Get
Attribute
(wxT("checked"), wxEmptyString);
v.MakeLower();
v.MakeLower();
- if (v
&& v
== wxT("1"))
- control->Check( i,
TRUE
);
+ if (v == wxT("1"))
+ control->Check( i,
true
);
- i++;
+ i++;
n = n->GetNext();
}
n = n->GetNext();
}
-
+
SetupWindow(control);
SetupWindow(control);
- if( strings != NULL )
- delete [] strings;
- strList.Clear(); // dump the strings
+ strList.Clear(); // dump the strings
return control;
}
return control;
}
@@
-90,20
+93,18
@@
wxObject *wxCheckListXmlHandler::DoCreateResource()
// handle <item checked="boolean">Label</item>
// add to the list
// handle <item checked="boolean">Label</item>
// add to the list
- strList.Add( GetNodeContent(m_node) );
-
+ wxString str = GetNodeContent(m_node);
+ if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
+ str = wxGetTranslation(str, m_resource->GetDomain());
+ strList.Add(str);
return NULL;
}
return NULL;
}
-
}
}
-
-
-bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node)
+bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)
{
{
- return (IsOfClass(node, wxT("wxCheckList")) ||
- (m_insideBox && node->GetName() == wxT("item"))
- );
+ return (IsOfClass(node, wxT("wxCheckListBox")) ||
+ (m_insideBox && node->GetName() == wxT("item")));
}
}
-
+#endif // wxUSE_XRC && wxUSE_CHECKLISTBOX