Fix wxHash{Set,Map} compilation with g++ 4.7 in C++11 mode.

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

diff --git a/src/xrc/xh_cald.cpp b/src/xrc/xh_cald.cpp
index 42d706c1de5e1f5a973ab1fcee32f22809da23f6..d6514cbe7edc6d4ebc6ba03662c60a6485ac072a 100644 (file)
--- a/src/xrc/xh_cald.cpp
+++ b/src/xrc/xh_cald.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_cald.cpp
+// Name:        src/xrc/xh_cald.cpp

 // Purpose:     XRC resource for wxCalendarCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09
 // Purpose:     XRC resource for wxCalendarCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09


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

-#ifdef __GNUG__
-#pragma implementation "xh_cald.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_XML && wxUSE_XRC && wxUSE_CALENDARCTRL
+#if wxUSE_XRC && wxUSE_CALENDARCTRL

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

-#include "wx/event.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/event.h"
+#endif //WX_PRECOMP
+

 #include "wx/calctrl.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler, wxXmlResourceHandler)
 #include "wx/calctrl.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler, wxXmlResourceHandler)


@@ -64,4 +64,4 @@ bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxCalendarCtrl"));
 }
 
     return IsOfClass(node, wxT("wxCalendarCtrl"));
 }
 

-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_CALENDARCTRL
+#endif // wxUSE_XRC && wxUSE_CALENDARCTRL