Prevents crashes caused by negative line count being passed to wrapping functions...

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

diff --git a/src/xrc/xh_listb.cpp b/src/xrc/xh_listb.cpp
index c3c9004d3f2f45a2020fce4aa84526eff33b0ca0..a319449d20ccc2e3d87311c7b679d70e49462009 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
@@ -7,10 +7,6 @@
 // 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"
@@ -19,12 +15,19 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_LISTBOX
+
 #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);
@@ -37,14 +40,14 @@ wxListBoxXmlHandler::wxListBoxXmlHandler()
 }
 
 wxObject *wxListBoxXmlHandler::DoCreateResource()
-{ 
+{
     if( m_class == wxT("wxListBox"))
     {
         // 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)
@@ -73,7 +76,7 @@ wxObject *wxListBoxXmlHandler::DoCreateResource()
 
         if (strings != NULL)
             delete[] strings;
-        strList.Clear();    // dump the strings   
+        strList.Clear();    // dump the strings
 
         return control;
     }
@@ -81,11 +84,11 @@ wxObject *wxListBoxXmlHandler::DoCreateResource()
     {
         // on the inside now.
         // handle <item>Label</item>
-        
+
         // add to the list
         wxString str = GetNodeContent(m_node);
         if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
-            str = wxGetTranslation(str);
+            str = wxGetTranslation(str, m_resource->GetDomain());
         strList.Add(str);
 
         return NULL;
@@ -97,3 +100,5 @@ bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node)
     return (IsOfClass(node, wxT("wxListBox")) ||
            (m_insideBox && node->GetName() == wxT("item")));
 }
+
+#endif // wxUSE_XRC && wxUSE_LISTBOX