Reflect changes in stc.cpp in stc.cpp.in from which it's generated.

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

diff --git a/src/xrc/xh_bmpcbox.cpp b/src/xrc/xh_bmpcbox.cpp
index 464f75b79fad172001882c7b04e5a9502cf84c35..533f52fd8425c6a4f08ff42ca90ae5d32b89cc07 100644 (file)
--- a/src/xrc/xh_bmpcbox.cpp
+++ b/src/xrc/xh_bmpcbox.cpp
@@ -3,7 +3,6 @@
 // Purpose:     XRC resource for wxBitmapComboBox
 // Author:      Jaakko Salli
 // Created:     Sep-10-2006
 // Purpose:     XRC resource for wxBitmapComboBox
 // Author:      Jaakko Salli
 // Created:     Sep-10-2006

-// RCS-ID:      $Id$

 // Copyright:   (c) 2006 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2006 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -26,6 +25,8 @@
 
 #include "wx/bmpcbox.h"
 
 
 #include "wx/bmpcbox.h"
 

+#include "wx/xml/xml.h"
+

 IMPLEMENT_DYNAMIC_CLASS(wxBitmapComboBoxXmlHandler, wxXmlResourceHandler)
 
 wxBitmapComboBoxXmlHandler::wxBitmapComboBoxXmlHandler()
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapComboBoxXmlHandler, wxXmlResourceHandler)
 
 wxBitmapComboBoxXmlHandler::wxBitmapComboBoxXmlHandler()


@@ -44,8 +45,7 @@ wxObject *wxBitmapComboBoxXmlHandler::DoCreateResource()
     {
         if ( !m_combobox )
         {
     {
         if ( !m_combobox )
         {

-            wxLogError(_("XRC syntex error: ownerdrawnitem only allowed within "
-                         " a bitmapcombobox!"));
+            ReportError("ownerdrawnitem only allowed within a wxBitmapComboBox");

             return NULL;
         }
 
             return NULL;
         }