reverted wxStaticCast change which obviously can't work as there is already a wxStati...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 8d58b43bfae28c0727144676a028cb03495cbe7e..3384a05b4b071a837b76d56e7174abceadf42d2b 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -293,12 +293,6 @@ typedef int wxWindowID;
     #define wxConstCast(obj, className) ((className *)(obj))
 #endif
 
-#ifdef HAVE_STATIC_CAST
-    #define wxStaticCast(val, type) static_cast<type>(val)
-#else
-    #define wxStaticCast(val, type) ((type)(val))
-#endif
-
 #ifndef HAVE_STD_WSTRING
     #if defined(__VISUALC__) && (__VISUALC__ >= 1100)
         /*  VC++ 6.0 and 5.0 have std::wstring (what about earlier versions?) */

diff --git a/include/wx/event.h b/include/wx/event.h
index d2467c125bf6e57608ee4454889ef40f610e75ee..c90a41c1dff6a8854aea1ae616073959d5fe2a7c 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -57,7 +57,11 @@ typedef int wxEventType;
 
 // this is used to make the event table entry type safe, so that for an event
 // handler only a function with proper parameter list can be given.
-#define wxStaticCastEvent(type, val) wxStaticCast(val, type)
+#ifdef HAVE_STATIC_CAST
+    #define wxStaticCastEvent(type, val) static_cast<type>(val)
+#else
+    #define wxStaticCastEvent(type, val) ((type)(val))
+#endif
 
 // in previous versions of wxWindows the event types used to be constants
 // which created difficulties with custom/user event types definition