From da58438429ea28c4699672b0203b8e07475a230a Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 10 Jul 2001 02:57:37 +0000 Subject: [PATCH] fix vc++ bug --- panda/src/pgui/pgMouseWatcherParameter.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/panda/src/pgui/pgMouseWatcherParameter.h b/panda/src/pgui/pgMouseWatcherParameter.h index f37a64082b..29ec3461f3 100644 --- a/panda/src/pgui/pgMouseWatcherParameter.h +++ b/panda/src/pgui/pgMouseWatcherParameter.h @@ -32,7 +32,12 @@ // TypedReferenceCount so we can attach this thing to an // event. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGMouseWatcherParameter : public MouseWatcherParameter, public TypedReferenceCount { +class EXPCL_PANDA PGMouseWatcherParameter : public TypedReferenceCount, public MouseWatcherParameter { + // For now, this must inherit from TypedReferenceCount on the left, + // because MSVC++ wants to make that base class be the one at the + // front of the structure, not MouseWatcherParameter for some + // reason, and interrogate assumes that whichever base class is on + // the left will be at the front of the structure. public: INLINE PGMouseWatcherParameter(); INLINE PGMouseWatcherParameter(const MouseWatcherParameter ©);