fix crash which happened if you called SetAttr(NULL) followed by SetAttr(attr) (...

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

diff --git a/src/xrc/xh_listc.cpp b/src/xrc/xh_listc.cpp
index f133a894f7cfede9cbd0df61b72005beb17493da..64eec4e746dcb1153b718e24491d5d69dade7adc 100644 (file)
--- a/src/xrc/xh_listc.cpp
+++ b/src/xrc/xh_listc.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_listc.cpp
+// Name:        src/xrc/xh_listc.cpp
 // Purpose:     XRC resource for wxListCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09
@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_listc.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -19,15 +15,21 @@
     #pragma hdrstop
 #endif
 
-#include "wx/textctrl.h"
+#if wxUSE_XRC && wxUSE_LISTCTRL
+
 #include "wx/xrc/xh_listc.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+#endif
+
 #include "wx/listctrl.h"
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxListCtrlXmlHandler, wxXmlResourceHandler)
 
-wxListCtrlXmlHandler::wxListCtrlXmlHandler() 
-: wxXmlResourceHandler() 
+wxListCtrlXmlHandler::wxListCtrlXmlHandler()
+: wxXmlResourceHandler()
 {
     XRC_ADD_STYLE(wxLC_LIST);
     XRC_ADD_STYLE(wxLC_REPORT);
@@ -50,7 +52,7 @@ wxListCtrlXmlHandler::wxListCtrlXmlHandler()
 }
 
 wxObject *wxListCtrlXmlHandler::DoCreateResource()
-{ 
+{
     XRC_MAKE_INSTANCE(list, wxListCtrl)
 
     list->Create(m_parentAsWindow,
@@ -61,9 +63,9 @@ wxObject *wxListCtrlXmlHandler::DoCreateResource()
                  GetName());
 
     // FIXME: add columns definition
-    
+
     SetupWindow(list);
-    
+
     return list;
 }
 
@@ -71,3 +73,5 @@ bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxListCtrl"));
 }
+
+#endif // wxUSE_XRC && wxUSE_LISTCTRL