non-unicode build fix

[wxWidgets.git] / src / xrc / xh_radbx.cpp

diff --git a/src/xrc/xh_radbx.cpp b/src/xrc/xh_radbx.cpp
index 2fbf045da3bf162da67c9ad7efb2945a0825b87d..5b950e2e93a777e9202bdd6610ea84e958c4304b 100644 (file)
--- a/src/xrc/xh_radbx.cpp
+++ b/src/xrc/xh_radbx.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
+

 #ifdef __GNUG__
 #pragma implementation "xh_radbx.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "xh_radbx.h"
 #endif


@@ -21,28 +21,31 @@
 
 #include "wx/xrc/xh_radbx.h"
 #include "wx/radiobox.h"
 
 #include "wx/xrc/xh_radbx.h"
 #include "wx/radiobox.h"

+#include "wx/intl.h"

 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 

-wxRadioBoxXmlHandler::wxRadioBoxXmlHandler() 
-: wxXmlResourceHandler() , m_insideBox(FALSE)
+IMPLEMENT_DYNAMIC_CLASS(wxRadioBoxXmlHandler, wxXmlResourceHandler)
+
+wxRadioBoxXmlHandler::wxRadioBoxXmlHandler()
+: 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();
 }
 
 wxObject *wxRadioBoxXmlHandler::DoCreateResource()
     AddWindowStyles();
 }
 
 wxObject *wxRadioBoxXmlHandler::DoCreateResource()

-{ 
+{

     if( m_class == wxT("wxRadioBox"))
     {
         // find the selection
         long selection = GetLong( wxT("selection"), -1 );
 
         // need to build the list of strings from children
     if( m_class == wxT("wxRadioBox"))
     {
         // find the selection
         long selection = GetLong( wxT("selection"), -1 );
 
         // need to build the list of strings from children

-        m_insideBox = TRUE;
+        m_insideBox = true;

         CreateChildrenPrivately( NULL, GetParamNode(wxT("content")));
         wxString *strings = (wxString *) NULL;
         if( strList.GetCount() > 0 )
         CreateChildrenPrivately( NULL, GetParamNode(wxT("content")));
         wxString *strings = (wxString *) NULL;
         if( strList.GetCount() > 0 )


@@ -53,10 +56,7 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
                 strings[i]=strList[i];
         }
 
                 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(),
 
         control->Create(m_parentAsWindow,
                         GetID(),


@@ -69,14 +69,14 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
                         wxDefaultValidator,
                         GetName());
 
                         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;
     }


@@ -86,20 +86,20 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
         // handle <item selected="boolean">Label</item>
 
         // add to the list
         // 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;
     }
 
 }
 
 
         return NULL;
     }
 
 }
 

-
-

 bool wxRadioBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
     return (IsOfClass(node, wxT("wxRadioBox")) ||
 bool wxRadioBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
     return (IsOfClass(node, wxT("wxRadioBox")) ||

-           (m_insideBox && node->GetName() == wxT("item"))
-           );
+           (m_insideBox && node->GetName() == wxT("item")));

 }
 
 #endif
 }
 
 #endif