remove superfluous assert

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

diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp
index c7a2e255eb3b7379041ced1fb8bafc12cc42aa10..99c037055926eb8a44a5e64a45b0808eeca8ad70 100644 (file)
--- a/src/xrc/xh_combo.cpp
+++ b/src/xrc/xh_combo.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/xrc/xh_combo.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/xrc/xh_combo.cpp

-// Purpose:     XRC resource for wxRadioBox
+// Purpose:     XRC resource for wxComboBox

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


@@ -21,14 +21,14 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/combobox.h"

 #endif
 
 #endif
 

-#include "wx/combobox.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler)
 
 wxComboBoxXmlHandler::wxComboBoxXmlHandler()
 IMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler)
 
 wxComboBoxXmlHandler::wxComboBoxXmlHandler()

-: wxXmlResourceHandler() , m_insideBox(false)
+                     :wxXmlResourceHandler()
+                     ,m_insideBox(false)

 {
     XRC_ADD_STYLE(wxCB_SIMPLE);
     XRC_ADD_STYLE(wxCB_SORT);
 {
     XRC_ADD_STYLE(wxCB_SIMPLE);
     XRC_ADD_STYLE(wxCB_SORT);


@@ -87,7 +87,7 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
         // add to the list
         wxString str = GetNodeContent(m_node);
         if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
         // 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;
         strList.Add(str);
 
         return NULL;