reverted last commit, still broken for VC6

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

diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp
index 4de735f9d215ea53fa928dcb89036e342e6d39bf..29262cc59e15e3a205a5820235dacb99044c6a25 100644 (file)
--- a/src/xrc/xh_choic.cpp
+++ b/src/xrc/xh_choic.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
+
 #ifdef __GNUG__
 #pragma implementation "xh_choic.h"
 #endif
@@ -19,39 +19,41 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_choic.h"
 #include "wx/choice.h"
+#include "wx/intl.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler)
 
-wxChoiceXmlHandler::wxChoiceXmlHandler() 
-: wxXmlResourceHandler() , m_insideBox(FALSE)
+wxChoiceXmlHandler::wxChoiceXmlHandler()
+: wxXmlResourceHandler() , m_insideBox(false)
 {
-    ADD_STYLE(wxCB_SORT);
+    XRC_ADD_STYLE(wxCB_SORT);
     AddWindowStyles();
 }
 
 wxObject *wxChoiceXmlHandler::DoCreateResource()
-{ 
+{
     if( m_class == wxT("wxChoice"))
     {
         // find the selection
-        long selection = GetLong( wxT("selection"), -1 );
+        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;
-        if( strList.GetCount() > 0 )
+        if (strList.GetCount() > 0)
         {
             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];
         }
 
-        wxChoice *control = wxStaticCast(m_instance, wxChoice);
-
-        if (!control)
-           control = new wxChoice;
+        XRC_MAKE_INSTANCE(control, wxChoice)
 
         control->Create(m_parentAsWindow,
                         GetID(),
@@ -62,14 +64,14 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
                         wxDefaultValidator,
                         GetName());
 
-        if( selection != -1 )
-            control->SetSelection( selection );
+        if (selection != -1)
+            control->SetSelection(selection);
 
         SetupWindow(control);
 
-        if( strings != NULL )
-            delete [] strings;
-        strList.Clear();    // dump the strings   
+        if (strings != NULL)
+            delete[] strings;
+        strList.Clear();    // dump the strings
 
         return control;
     }
@@ -77,22 +79,21 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
     {
         // on the inside now.
         // 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;
     }
-
 }
 
-
-
 bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
 {
     return (IsOfClass(node, wxT("wxChoice")) ||
-           (m_insideBox && node->GetName() == wxT("item"))
-           );
+           (m_insideBox && node->GetName() == wxT("item")));
 }
 
-
+#endif // wxUSE_XRC