]> git.saurik.com Git - wxWidgets.git/blobdiff - src/xrc/xh_bmpcbox.cpp
fix a typo in comment
[wxWidgets.git] / src / xrc / xh_bmpcbox.cpp
index 6fc2840bd676c594eb7b44ebd60470afa450ee02..464f75b79fad172001882c7b04e5a9502cf84c35 100644 (file)
@@ -21,6 +21,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/bmpcbox.h"
@@ -41,9 +42,15 @@ wxObject *wxBitmapComboBoxXmlHandler::DoCreateResource()
 {
     if (m_class == wxT("ownerdrawnitem"))
     {
-        wxCHECK_MSG(m_combobox, NULL, wxT("Incorrect syntax of XRC resource: ownerdrawnitem not within a bitmapcombobox!"));
+        if ( !m_combobox )
+        {
+            wxLogError(_("XRC syntex error: ownerdrawnitem only allowed within "
+                         " a bitmapcombobox!"));
+            return NULL;
+        }
 
-        m_combobox->Append(GetText(wxT("text")), GetBitmap(wxT("bitmap"), wxART_MISSING_IMAGE));
+        m_combobox->Append(GetText(wxT("text")),
+                           GetBitmap(wxT("bitmap")));
 
         return m_combobox;
     }