Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted wxStaticCast change which obviously can't work as there is already a wxStaticCast in wx/object.h...

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-02-10 22:17:30 +00:00
parent 3fe7375573
commit 0891fcb11f
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/defs.h
View File

@@ -293,12 +293,6 @@ typedef int wxWindowID;
#define wxConstCast(obj, className) ((className *)(obj)) #define wxConstCast(obj, className) ((className *)(obj))
#endif #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 #ifndef HAVE_STD_WSTRING
#if defined(__VISUALC__) && (__VISUALC__ >= 1100) #if defined(__VISUALC__) && (__VISUALC__ >= 1100)
/* VC++ 6.0 and 5.0 have std::wstring (what about earlier versions?) */ /* VC++ 6.0 and 5.0 have std::wstring (what about earlier versions?) */

6
include/wx/event.h
View File

@@ -57,7 +57,11 @@ typedef int wxEventType;
// this is used to make the event table entry type safe, so that for an event // 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. // 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 // in previous versions of wxWindows the event types used to be constants
// which created difficulties with custom/user event types definition // which created difficulties with custom/user event types definition