change to a tiny minimal value for DoGetBestSize in case of existing entries

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

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index 81f06455f025d2518473cdbae17e78b89acb514b..408c02570dd950022cbc7dd36b17b2e1f0c5bd5f 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -21,6 +21,7 @@
 
 #include "wx/xrc/xh_chckl.h"
 #include "wx/checklst.h"
+#include "wx/intl.h"
 
 wxCheckListXmlHandler::wxCheckListXmlHandler() 
 : wxXmlResourceHandler(), m_insideBox(FALSE)
@@ -37,18 +38,15 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
         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++ )
-                strings[i]=strList[i];
+            for(int i = 0; i < count; i++)
+                strings[i] = strList[i];
         }
 
-        wxCheckListBox *control = wxStaticCast(m_instance, wxCheckListBox);
-
-        if (!control)
-           control = new wxCheckListBox;
+        XRC_MAKE_INSTANCE(control, wxCheckListBox)
 
         control->Create(m_parentAsWindow,
                         GetID(),
@@ -81,8 +79,8 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
         
         SetupWindow(control);
 
-        if( strings != NULL )
-            delete [] strings;
+        if (strings != NULL)
+            delete[] strings;
         strList.Clear();    // dump the strings   
 
         return control;
@@ -93,20 +91,18 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
         // handle <item checked="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;
     }
-
 }
 
-
-
 bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node)
 {
     return (IsOfClass(node, wxT("wxCheckList")) ||
-           (m_insideBox && node->GetName() == wxT("item"))
-           );
+           (m_insideBox && node->GetName() == wxT("item")));
 }