X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..d8692f2b805de780a6a625879abbe550830a5bab:/src/xrc/xh_radbx.cpp

diff --git a/src/xrc/xh_radbx.cpp b/src/xrc/xh_radbx.cpp
index 2fbf045da3..0bff4dda51 100644
--- a/src/xrc/xh_radbx.cpp
+++ b/src/xrc/xh_radbx.cpp
@@ -21,16 +21,19 @@
 
 #include "wx/xrc/xh_radbx.h"
 #include "wx/radiobox.h"
+#include "wx/intl.h"
 
 #if wxUSE_RADIOBOX
 
+IMPLEMENT_DYNAMIC_CLASS(wxRadioBoxXmlHandler, wxXmlResourceHandler)
+
 wxRadioBoxXmlHandler::wxRadioBoxXmlHandler() 
-: wxXmlResourceHandler() , m_insideBox(FALSE)
+: wxXmlResourceHandler(), m_insideBox(FALSE)
 {
-    ADD_STYLE(wxRA_SPECIFY_COLS);
-    ADD_STYLE(wxRA_HORIZONTAL);
-    ADD_STYLE(wxRA_SPECIFY_ROWS);
-    ADD_STYLE(wxRA_VERTICAL);
+    XRC_ADD_STYLE(wxRA_SPECIFY_COLS);
+    XRC_ADD_STYLE(wxRA_HORIZONTAL);
+    XRC_ADD_STYLE(wxRA_SPECIFY_ROWS);
+    XRC_ADD_STYLE(wxRA_VERTICAL);
     AddWindowStyles();
 }
 
@@ -53,10 +56,7 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
                 strings[i]=strList[i];
         }
 
-        wxRadioBox *control = wxStaticCast(m_instance, wxRadioBox);
-
-        if (!control)
-           control = new wxRadioBox;
+        XRC_MAKE_INSTANCE(control, wxRadioBox)
 
         control->Create(m_parentAsWindow,
                         GetID(),
@@ -69,13 +69,13 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
                         wxDefaultValidator,
                         GetName());
 
-        if( selection != -1 )
-            control->SetSelection( selection );
+        if (selection != -1)
+            control->SetSelection(selection);
 
         SetupWindow(control);
 
-        if( strings != NULL )
-            delete [] strings;
+        if (strings != NULL)
+            delete[] strings;
         strList.Clear();    // dump the strings   
 
         return control;
@@ -86,20 +86,20 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
         // handle <item selected="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);
+        strList.Add(str);
 
         return NULL;
     }
 
 }
 
-
-
 bool wxRadioBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
     return (IsOfClass(node, wxT("wxRadioBox")) ||
-           (m_insideBox && node->GetName() == wxT("item"))
-           );
+           (m_insideBox && node->GetName() == wxT("item")));
 }
 
 #endif