projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PCH-less build fix
[wxWidgets.git]
/
src
/
xrc
/
xh_choic.cpp
diff --git
a/src/xrc/xh_choic.cpp
b/src/xrc/xh_choic.cpp
index 29262cc59e15e3a205a5820235dacb99044c6a25..6a0ccc2566a834ce8e99428858d6b782c1b5d518 100644
(file)
--- a/
src/xrc/xh_choic.cpp
+++ b/
src/xrc/xh_choic.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_choic.cpp
+// Name:
src/xrc/
xh_choic.cpp
// Purpose: XRC resource for wxChoice
// Author: Bob Mitchell
// Created: 2000/03/21
// Purpose: XRC resource for wxChoice
// Author: Bob Mitchell
// Created: 2000/03/21
@@
-8,10
+8,6
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "xh_choic.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,11
+15,14
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#if wxUSE_XRC
+#if wxUSE_XRC
&& wxUSE_CHOICE
#include "wx/xrc/xh_choic.h"
#include "wx/xrc/xh_choic.h"
-#include "wx/choice.h"
-#include "wx/intl.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/choice.h"
+#endif
IMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler)
IMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler)
@@
-44,22
+43,13
@@
wxObject *wxChoiceXmlHandler::DoCreateResource()
// need to build the list of strings from children
m_insideBox = true;
CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
// need to build the list of strings from children
m_insideBox = true;
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, wxChoice)
control->Create(m_parentAsWindow,
GetID(),
GetPosition(), GetSize(),
XRC_MAKE_INSTANCE(control, wxChoice)
control->Create(m_parentAsWindow,
GetID(),
GetPosition(), GetSize(),
- strList.GetCount(),
- strings,
+ strList,
GetStyle(),
wxDefaultValidator,
GetName());
GetStyle(),
wxDefaultValidator,
GetName());
@@
-69,8
+59,6
@@
wxObject *wxChoiceXmlHandler::DoCreateResource()
SetupWindow(control);
SetupWindow(control);
- if (strings != NULL)
- delete[] strings;
strList.Clear(); // dump the strings
return control;
strList.Clear(); // dump the strings
return control;
@@
-83,7
+71,7
@@
wxObject *wxChoiceXmlHandler::DoCreateResource()
// add to the list
wxString str = GetNodeContent(m_node);
if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
// add to the list
wxString str = GetNodeContent(m_node);
if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
- str = wxGetTranslation(str);
+ str = wxGetTranslation(str
, m_resource->GetDomain()
);
strList.Add(str);
return NULL;
strList.Add(str);
return NULL;
@@
-96,4
+84,4
@@
bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
(m_insideBox && node->GetName() == wxT("item")));
}
(m_insideBox && node->GetName() == wxT("item")));
}
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC
&& wxUSE_CHOICE