Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/xrc/xh_radbx.cpp b/src/xrc/xh_radbx.cpp
index 244960bd133b5fa9ae206fbe6ea51f16bebb3f1c..07a98db9b83b3ff0e2625f2e8c733dccd5328da3 100644 (file)
--- a/src/xrc/xh_radbx.cpp
+++ b/src/xrc/xh_radbx.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

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


@@ -19,13 +19,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC && wxUSE_RADIOBOX
+

 #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
+IMPLEMENT_DYNAMIC_CLASS(wxRadioBoxXmlHandler, wxXmlResourceHandler)

 
 

-wxRadioBoxXmlHandler::wxRadioBoxXmlHandler() 
-: wxXmlResourceHandler(), m_insideBox(FALSE)
+wxRadioBoxXmlHandler::wxRadioBoxXmlHandler()
+: wxXmlResourceHandler(), m_insideBox(false)

 {
     XRC_ADD_STYLE(wxRA_SPECIFY_COLS);
     XRC_ADD_STYLE(wxRA_HORIZONTAL);
 {
     XRC_ADD_STYLE(wxRA_SPECIFY_COLS);
     XRC_ADD_STYLE(wxRA_HORIZONTAL);


@@ -35,14 +38,14 @@ wxRadioBoxXmlHandler::wxRadioBoxXmlHandler()
 }
 
 wxObject *wxRadioBoxXmlHandler::DoCreateResource()
 }
 
 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 )


@@ -73,7 +76,7 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
 
         if (strings != NULL)
             delete[] strings;
 
         if (strings != NULL)
             delete[] strings;

-        strList.Clear();    // dump the strings   
+        strList.Clear();    // dump the strings

 
         return control;
     }
 
         return control;
     }


@@ -83,7 +86,10 @@ 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;
     }


@@ -96,4 +102,4 @@ bool wxRadioBoxXmlHandler::CanHandle(wxXmlNode *node)
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
            (m_insideBox && node->GetName() == wxT("item")));
 }
 

-#endif
+#endif // wxUSE_XRC && wxUSE_RADIOBOX