wxDataViewCtrl::Expand() only works on items whose parents are already

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

diff --git a/src/xrc/xh_bmpcbox.cpp b/src/xrc/xh_bmpcbox.cpp
index 138d2ee58b8e32b73c27e0ca13ecbb5abb0a04cb..43936df9dd8e66eb3dae870e46d1e32041fe1b0a 100644 (file)
--- a/src/xrc/xh_bmpcbox.cpp
+++ b/src/xrc/xh_bmpcbox.cpp
@@ -21,6 +21,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/bmpcbox.h"
@@ -41,7 +42,11 @@ 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 )
+        {
+            ReportError("ownerdrawnitem only allowed within a wxBitmapComboBox");
+            return NULL;
+        }
 
         m_combobox->Append(GetText(wxT("text")),
                            GetBitmap(wxT("bitmap")));