Applied patch #1582212 (completed/fixed toolbar's wxTB_BOTTOM implementation).

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

diff --git a/src/xrc/xh_listc.cpp b/src/xrc/xh_listc.cpp
index 4a0c1f252a0c076fe95c62b14abb4a5196b1732e..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
 // Purpose:     XRC resource for wxListCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09


@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xh_listc.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -19,10 +15,14 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_LISTCTRL

 
 

-#include "wx/textctrl.h"

 #include "wx/xrc/xh_listc.h"
 #include "wx/xrc/xh_listc.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+#endif
+

 #include "wx/listctrl.h"
 
 
 #include "wx/listctrl.h"
 
 


@@ -74,4 +74,4 @@ bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxListCtrl"));
 }
 
     return IsOfClass(node, wxT("wxListCtrl"));
 }
 

-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_LISTCTRL