From d4c25daa1b9128d2a659412bbbecb9ff038c2475 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 29 Sep 2004 07:21:18 +0000 Subject: [PATCH] C++ removed from C syntax. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 92167acc7d..5a0ede9afa 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -740,12 +740,15 @@ typedef wxUint32 wxDword; #error "Pointers can't be stored inside integer types." #endif +#ifdef __cplusplus /* And also define a simple function to cast pointer to it. */ inline wxUIntPtr wxPtrToUInt(void *p) { - // VC++ 7.1 gives warnings about casts such as below even when they're - // explicit with /Wp64 option, suppress them as we really know what we're - // doing here + /* + VC++ 7.1 gives warnings about casts such as below even when they're + explicit with /Wp64 option, suppress them as we really know what we're + doing here + */ #ifdef __VISUALC__ #pragma warning(disable: 4311) /* pointer truncation from '' to '' */ #endif @@ -756,6 +759,7 @@ inline wxUIntPtr wxPtrToUInt(void *p) #pragma warning(default: 4311) #endif } +#endif /*__cplusplus*/ /* 64 bit */ @@ -1083,7 +1087,7 @@ enum wxStretch wxFIXED_MINSIZE = 0x8000, wxTILE = 0xc000, - // for compatibility only, default now, don't use explicitly any more + /* for compatibility only, default now, don't use explicitly any more */ #if WXWIN_COMPATIBILITY_2_4 wxADJUST_MINSIZE = 0x00100000 #else @@ -1234,7 +1238,7 @@ enum wxBorder #define wxDIALOG_EX_CONTEXTHELP 0x00000004 /* Create a window which is attachable to another top level window */ -#define wxFRAME_DRAWER 0x0020 +#define wxFRAME_DRAWER 0x0020 /* * MDI parent frame style flags @@ -2123,8 +2127,8 @@ typedef unsigned long WXDWORD; typedef unsigned short WXWORD; -//typedef void* WXWidget; -//typedef void* WXWindow; +/* typedef void* WXWidget; */ +/* typedef void* WXWindow; */ typedef WX_OPAQUE_TYPE(ControlRef ) * WXWidget ; typedef WX_OPAQUE_TYPE(WindowRef) * WXWindow ; typedef void* WXDisplay; -- 2.45.2