wxMac doesn't use wxTaskBarIcon

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

diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp
index 2d2dc7b0c91c086ea6ddfdc4eee55809b7f343df..f2dd0bdb43b5f3ed90444be3996bca6da64f407d 100644 (file)
--- a/src/xrc/xh_choic.cpp
+++ b/src/xrc/xh_choic.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_choic.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_choic.cpp

-// Purpose:     XML resource for wxChoice
+// Purpose:     XRC resource for wxChoice

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$


@@ -21,11 +21,12 @@
 
 #include "wx/xrc/xh_choic.h"
 #include "wx/choice.h"
 
 #include "wx/xrc/xh_choic.h"
 #include "wx/choice.h"

+#include "wx/intl.h"

 
 wxChoiceXmlHandler::wxChoiceXmlHandler() 
 : wxXmlResourceHandler() , m_insideBox(FALSE)
 {
 
 wxChoiceXmlHandler::wxChoiceXmlHandler() 
 : wxXmlResourceHandler() , m_insideBox(FALSE)
 {

-    ADD_STYLE(wxCB_SORT);
+    XRC_ADD_STYLE(wxCB_SORT);

     AddWindowStyles();
 }
 
     AddWindowStyles();
 }
 


@@ -34,38 +35,38 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
     if( m_class == wxT("wxChoice"))
     {
         // find the selection
     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;
 
         // need to build the list of strings from children
         m_insideBox = TRUE;

-        CreateChildrenPrivately( NULL, GetParamNode(wxT("content")));
+        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, wxChoice)

 
 

-        wxChoice *control = new wxChoice(m_parentAsWindow,
-                                    GetID(),
-                                    GetPosition(), GetSize(),
-                                    strList.GetCount(),
-                                    strings,
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
+        control->Create(m_parentAsWindow,
+                        GetID(),
+                        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;
+        if (strings != NULL)
+            delete[] strings;

         strList.Clear();    // dump the strings   
 
         return control;
         strList.Clear();    // dump the strings   
 
         return control;


@@ -76,20 +77,17 @@ wxObject *wxChoiceXmlHandler::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 wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
 {
     return (IsOfClass(node, wxT("wxChoice")) ||
 bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
 {
     return (IsOfClass(node, wxT("wxChoice")) ||

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

 }
 }

-
-