Browse Source

protect cppparser

David Rose 16 years ago
parent
commit
366d56a74b

+ 2 - 2
panda/src/display/nativeWindowHandle.I

@@ -74,7 +74,7 @@ get_handle() const {
 }
 }
 #endif  // HAVE_X11
 #endif  // HAVE_X11
 
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(CPPPARSER)
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 //     Function: NativeWindowHandle::WinHandle::Constructor
 //     Function: NativeWindowHandle::WinHandle::Constructor
 //       Access: Public
 //       Access: Public
@@ -85,7 +85,7 @@ WinHandle(HWND handle) : _handle(handle) {
 }
 }
 #endif  // WIN32
 #endif  // WIN32
 
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(CPPPARSER)
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 //     Function: NativeWindowHandle::WinHandle::get_handle
 //     Function: NativeWindowHandle::WinHandle::get_handle
 //       Access: Public
 //       Access: Public

+ 4 - 4
panda/src/display/nativeWindowHandle.cxx

@@ -20,7 +20,7 @@ TypeHandle NativeWindowHandle::SubprocessHandle::_type_handle;
 #if defined(HAVE_X11) && !defined(CPPPARSER)
 #if defined(HAVE_X11) && !defined(CPPPARSER)
 TypeHandle NativeWindowHandle::X11Handle::_type_handle;
 TypeHandle NativeWindowHandle::X11Handle::_type_handle;
 #endif
 #endif
-#ifdef WIN32
+#if defined(WIN32) && !defined(CPPPARSER)
 TypeHandle NativeWindowHandle::WinHandle::_type_handle;
 TypeHandle NativeWindowHandle::WinHandle::_type_handle;
 #endif
 #endif
 
 
@@ -69,7 +69,7 @@ make_x11(Window window) {
 }
 }
 #endif  // HAVE_X11
 #endif  // HAVE_X11
 
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(CPPPARSER)
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 //     Function: NativeWindowHandle::make_win
 //     Function: NativeWindowHandle::make_win
 //       Access: Published, Static
 //       Access: Published, Static
@@ -140,7 +140,7 @@ output(ostream &out) const {
 }
 }
 #endif  // HAVE_X11
 #endif  // HAVE_X11
 
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(CPPPARSER)
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 //     Function: NativeWindowHandle::WinHandle::get_int_handle
 //     Function: NativeWindowHandle::WinHandle::get_int_handle
 //       Access: Public, Virtual
 //       Access: Public, Virtual
@@ -154,7 +154,7 @@ get_int_handle() const {
 }
 }
 #endif  // WIN32
 #endif  // WIN32
 
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(CPPPARSER)
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 //     Function: NativeWindowHandle::WinHandle::output
 //     Function: NativeWindowHandle::WinHandle::output
 //       Access: Public
 //       Access: Public

+ 3 - 3
panda/src/display/nativeWindowHandle.h

@@ -55,7 +55,7 @@ public:
   static PT(WindowHandle) make_x11(Window window);
   static PT(WindowHandle) make_x11(Window window);
 #endif  // HAVE_X11
 #endif  // HAVE_X11
 
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(CPPPARSER)
   static PT(WindowHandle) make_win(HWND window);
   static PT(WindowHandle) make_win(HWND window);
 #endif  // WIN32
 #endif  // WIN32
   
   
@@ -149,7 +149,7 @@ public:
 #endif  // HAVE_X11
 #endif  // HAVE_X11
 
 
 
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(CPPPARSER)
   class EXPCL_PANDA_DISPLAY WinHandle : public OSHandle {
   class EXPCL_PANDA_DISPLAY WinHandle : public OSHandle {
   public:
   public:
     INLINE WinHandle(HWND handle);
     INLINE WinHandle(HWND handle);
@@ -187,7 +187,7 @@ public:
 #if defined(HAVE_X11) && !defined(CPPPARSER)
 #if defined(HAVE_X11) && !defined(CPPPARSER)
     X11Handle::init_type();
     X11Handle::init_type();
 #endif
 #endif
-#ifdef WIN32
+#if defined(WIN32) && !defined(CPPPARSER)
     WinHandle::init_type();
     WinHandle::init_type();
 #endif
 #endif
   }
   }