avoid undefined behavior from token paste resulting in more than one token

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

diff --git a/src/xrc/xh_listb.cpp b/src/xrc/xh_listb.cpp
index 50790fbb34fe89717984b3b8bce3f4c96d1d8005..fb92aeae16844bfd3c5c3b76fabb3ba3cf4a6581 100644 (file)
--- a/src/xrc/xh_listb.cpp
+++ b/src/xrc/xh_listb.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_listb.cpp
+// Name:        src/xrc/xh_listb.cpp

 // Purpose:     XRC resource for wxListBox
 // Author:      Bob Mitchell & Vaclav Slavik
 // Created:     2000/07/29
 // Purpose:     XRC resource for wxListBox
 // Author:      Bob Mitchell & Vaclav Slavik
 // Created:     2000/07/29


@@ -7,10 +7,6 @@
 // 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_listb.h"
-#endif

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


@@ -19,12 +15,20 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC && wxUSE_LISTBOX
+

 #include "wx/xrc/xh_listb.h"
 #include "wx/xrc/xh_listb.h"

-#include "wx/listbox.h"
-#include "wx/intl.h"

 
 

-wxListBoxXmlHandler::wxListBoxXmlHandler() 
-: wxXmlResourceHandler() , m_insideBox(FALSE)
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/listbox.h"
+#endif
+
+IMPLEMENT_DYNAMIC_CLASS(wxListBoxXmlHandler, wxXmlResourceHandler)
+
+wxListBoxXmlHandler::wxListBoxXmlHandler()
+                   : wxXmlResourceHandler(),
+                     m_insideBox(false)

 {
     XRC_ADD_STYLE(wxLB_SINGLE);
     XRC_ADD_STYLE(wxLB_MULTIPLE);
 {
     XRC_ADD_STYLE(wxLB_SINGLE);
     XRC_ADD_STYLE(wxLB_MULTIPLE);


@@ -37,31 +41,23 @@ wxListBoxXmlHandler::wxListBoxXmlHandler()
 }
 
 wxObject *wxListBoxXmlHandler::DoCreateResource()
 }
 
 wxObject *wxListBoxXmlHandler::DoCreateResource()

-{ 
-    if( m_class == wxT("wxListBox"))
+{
+    if ( m_class == wxT("wxListBox"))

     {
         // find the selection
         long selection = GetLong(wxT("selection"), -1);
 
         // need to build the list of strings from children
     {
         // 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")));
         CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));

-        wxString *strings = (wxString *) NULL;
-        if (strList.GetCount() > 0)
-        {
-            strings = new wxString[strList.GetCount()];
-            int count = strList.GetCount();
-            for (int i = 0; i < count; i++)
-                strings[i]=strList[i];
-        }
+        m_insideBox = false;

 
         XRC_MAKE_INSTANCE(control, wxListBox)
 
         control->Create(m_parentAsWindow,
                         GetID(),
                         GetPosition(), GetSize(),
 
         XRC_MAKE_INSTANCE(control, wxListBox)
 
         control->Create(m_parentAsWindow,
                         GetID(),
                         GetPosition(), GetSize(),

-                        strList.GetCount(),
-                        strings,
+                        strList,

                         GetStyle(),
                         wxDefaultValidator,
                         GetName());
                         GetStyle(),
                         wxDefaultValidator,
                         GetName());


@@ -70,10 +66,7 @@ wxObject *wxListBoxXmlHandler::DoCreateResource()
             control->SetSelection(selection);
 
         SetupWindow(control);
             control->SetSelection(selection);
 
         SetupWindow(control);

-
-        if (strings != NULL)
-            delete[] strings;
-        strList.Clear();    // dump the strings   
+        strList.Clear();    // dump the strings

 
         return control;
     }
 
         return control;
     }


@@ -81,9 +74,12 @@ wxObject *wxListBoxXmlHandler::DoCreateResource()
     {
         // on the inside now.
         // handle <item>Label</item>
     {
         // on the inside now.
         // handle <item>Label</item>

-        
+

         // add to the list
         // add to the list

-        strList.Add(wxGetTranslation(GetNodeContent(m_node)));
+        wxString str = GetNodeContent(m_node);
+        if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
+            str = wxGetTranslation(str, m_resource->GetDomain());
+        strList.Add(str);

 
         return NULL;
     }
 
         return NULL;
     }


@@ -94,3 +90,5 @@ bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node)
     return (IsOfClass(node, wxT("wxListBox")) ||
            (m_insideBox && node->GetName() == wxT("item")));
 }
     return (IsOfClass(node, wxT("wxListBox")) ||
            (m_insideBox && node->GetName() == wxT("item")));
 }

+
+#endif // wxUSE_XRC && wxUSE_LISTBOX