projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CodeWarrior fixes
[wxWidgets.git]
/
src
/
xrc
/
xh_combo.cpp
diff --git
a/src/xrc/xh_combo.cpp
b/src/xrc/xh_combo.cpp
index 2353964bff9a185f9f0db08f0fadf54bf1f86dc7..ebae25ee0f6cd841c96487295c39497f08409ec1 100644
(file)
--- a/
src/xrc/xh_combo.cpp
+++ b/
src/xrc/xh_combo.cpp
@@
-1,16
+1,12
@@
/////////////////////////////////////////////////////////////////////////////
// Name: xh_combo.cpp
/////////////////////////////////////////////////////////////////////////////
// Name: xh_combo.cpp
-// Purpose: X
ML
resource for wxRadioBox
+// Purpose: X
RC
resource for wxRadioBox
// 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_combo.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,60
+15,63
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
+#if wxUSE_XRC && wxUSE_COMBOBOX
+
#include "wx/xrc/xh_combo.h"
#include "wx/combobox.h"
#include "wx/xrc/xh_combo.h"
#include "wx/combobox.h"
+#include "wx/intl.h"
-#if wxUSE_COMBOBOX
+IMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler)
-wxComboBoxXmlHandler::wxComboBoxXmlHandler()
-: wxXmlResourceHandler() , m_insideBox(
FALSE
)
+wxComboBoxXmlHandler::wxComboBoxXmlHandler()
+: wxXmlResourceHandler() , m_insideBox(
false
)
{
{
- ADD_STYLE(wxCB_SIMPLE);
- ADD_STYLE(wxCB_SORT);
- ADD_STYLE(wxCB_READONLY);
- ADD_STYLE(wxCB_DROPDOWN);
+
XRC_
ADD_STYLE(wxCB_SIMPLE);
+
XRC_
ADD_STYLE(wxCB_SORT);
+
XRC_
ADD_STYLE(wxCB_READONLY);
+
XRC_
ADD_STYLE(wxCB_DROPDOWN);
AddWindowStyles();
}
wxObject *wxComboBoxXmlHandler::DoCreateResource()
AddWindowStyles();
}
wxObject *wxComboBoxXmlHandler::DoCreateResource()
-{
+{
if( m_class == wxT("wxComboBox"))
{
// find the selection
long selection = GetLong( wxT("selection"), -1 );
// need to build the list of strings from children
if( m_class == wxT("wxComboBox"))
{
// find the selection
long selection = GetLong( wxT("selection"), -1 );
// need to build the list of strings from children
- m_insideBox =
TRUE
;
- CreateChildrenPrivately(
NULL, GetParamNode(wxT("content")));
+ m_insideBox =
true
;
+ CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
wxString *strings = (wxString *) NULL;
wxString *strings = (wxString *) NULL;
- if
( strList.GetCount() > 0
)
+ if
(strList.GetCount() > 0
)
{
strings = new wxString[strList.GetCount()];
int count = strList.GetCount();
{
strings = new wxString[strList.GetCount()];
int count = strList.GetCount();
- for
( int i = 0; i < count; i++
)
+ for
(int i = 0; i < count; i++
)
strings[i]=strList[i];
}
strings[i]=strList[i];
}
+ XRC_MAKE_INSTANCE(control, wxComboBox)
- wxComboBox *control = new wxComboBox(m_parentAsWindow,
- GetID(),
- GetText(wxT("value")),
- GetPosition(), GetSize(),
- strList.GetCount(),
- strings,
- GetStyle(),
- wxDefaultValidator,
- GetName()
- );
+ control->Create(m_parentAsWindow,
+ GetID(),
+ GetText(wxT("value")),
+ GetPosition(), GetSize(),
+ strList.GetCount(),
+ strings,
+ GetStyle(),
+ wxDefaultValidator,
+ GetName());
- if
( selection != -1
)
- control->SetSelection(
selection
);
+ if
(selection != -1
)
+ control->SetSelection(
selection
);
SetupWindow(control);
SetupWindow(control);
- if
( strings != NULL
)
- delete
[] strings;
- strList.Clear(); // dump the strings
+ if
(strings != NULL
)
+ delete[] strings;
+ strList.Clear(); // dump the strings
return control;
}
return control;
}
@@
-82,20
+81,19
@@
wxObject *wxComboBoxXmlHandler::DoCreateResource()
// handle <item>Label</item>
// add to the list
// handle <item>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);
+ strList.Add(str);
return NULL;
}
return NULL;
}
-
}
}
-
-
bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node)
{
return (IsOfClass(node, wxT("wxComboBox")) ||
bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node)
{
return (IsOfClass(node, wxT("wxComboBox")) ||
- (m_insideBox && node->GetName() == wxT("item"))
- );
+ (m_insideBox && node->GetName() == wxT("item")));
}
}
-#endif
+#endif
// wxUSE_XRC && wxUSE_COMBOBOX