From 366d56a74b511b6df874f1eb92ebe6584f4a3eaf Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 1 Oct 2009 00:31:16 +0000 Subject: [PATCH] protect cppparser --- panda/src/display/nativeWindowHandle.I | 4 ++-- panda/src/display/nativeWindowHandle.cxx | 8 ++++---- panda/src/display/nativeWindowHandle.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/panda/src/display/nativeWindowHandle.I b/panda/src/display/nativeWindowHandle.I index 0bea26e700..62fd3792e2 100644 --- a/panda/src/display/nativeWindowHandle.I +++ b/panda/src/display/nativeWindowHandle.I @@ -74,7 +74,7 @@ get_handle() const { } #endif // HAVE_X11 -#ifdef WIN32 +#if defined(WIN32) && !defined(CPPPARSER) //////////////////////////////////////////////////////////////////// // Function: NativeWindowHandle::WinHandle::Constructor // Access: Public @@ -85,7 +85,7 @@ WinHandle(HWND handle) : _handle(handle) { } #endif // WIN32 -#ifdef WIN32 +#if defined(WIN32) && !defined(CPPPARSER) //////////////////////////////////////////////////////////////////// // Function: NativeWindowHandle::WinHandle::get_handle // Access: Public diff --git a/panda/src/display/nativeWindowHandle.cxx b/panda/src/display/nativeWindowHandle.cxx index 30f70e0c7b..ce0e08c800 100644 --- a/panda/src/display/nativeWindowHandle.cxx +++ b/panda/src/display/nativeWindowHandle.cxx @@ -20,7 +20,7 @@ TypeHandle NativeWindowHandle::SubprocessHandle::_type_handle; #if defined(HAVE_X11) && !defined(CPPPARSER) TypeHandle NativeWindowHandle::X11Handle::_type_handle; #endif -#ifdef WIN32 +#if defined(WIN32) && !defined(CPPPARSER) TypeHandle NativeWindowHandle::WinHandle::_type_handle; #endif @@ -69,7 +69,7 @@ make_x11(Window window) { } #endif // HAVE_X11 -#ifdef WIN32 +#if defined(WIN32) && !defined(CPPPARSER) //////////////////////////////////////////////////////////////////// // Function: NativeWindowHandle::make_win // Access: Published, Static @@ -140,7 +140,7 @@ output(ostream &out) const { } #endif // HAVE_X11 -#ifdef WIN32 +#if defined(WIN32) && !defined(CPPPARSER) //////////////////////////////////////////////////////////////////// // Function: NativeWindowHandle::WinHandle::get_int_handle // Access: Public, Virtual @@ -154,7 +154,7 @@ get_int_handle() const { } #endif // WIN32 -#ifdef WIN32 +#if defined(WIN32) && !defined(CPPPARSER) //////////////////////////////////////////////////////////////////// // Function: NativeWindowHandle::WinHandle::output // Access: Public diff --git a/panda/src/display/nativeWindowHandle.h b/panda/src/display/nativeWindowHandle.h index 77814537a7..b2bf25ae7d 100644 --- a/panda/src/display/nativeWindowHandle.h +++ b/panda/src/display/nativeWindowHandle.h @@ -55,7 +55,7 @@ public: static PT(WindowHandle) make_x11(Window window); #endif // HAVE_X11 -#ifdef WIN32 +#if defined(WIN32) && !defined(CPPPARSER) static PT(WindowHandle) make_win(HWND window); #endif // WIN32 @@ -149,7 +149,7 @@ public: #endif // HAVE_X11 -#ifdef WIN32 +#if defined(WIN32) && !defined(CPPPARSER) class EXPCL_PANDA_DISPLAY WinHandle : public OSHandle { public: INLINE WinHandle(HWND handle); @@ -187,7 +187,7 @@ public: #if defined(HAVE_X11) && !defined(CPPPARSER) X11Handle::init_type(); #endif -#ifdef WIN32 +#if defined(WIN32) && !defined(CPPPARSER) WinHandle::init_type(); #endif }