From 02565158dcaf411c42d3603b2e1a15f7494e601d Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 1 Oct 2007 21:39:12 +0000 Subject: [PATCH] fix inlines --- panda/src/display/graphicsWindowInputDevice.h | 4 ++-- panda/src/event/pointerEventList.cxx | 2 +- panda/src/event/pointerEventList.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/panda/src/display/graphicsWindowInputDevice.h b/panda/src/display/graphicsWindowInputDevice.h index 3d2bf2e422..66e6bb9d3c 100644 --- a/panda/src/display/graphicsWindowInputDevice.h +++ b/panda/src/display/graphicsWindowInputDevice.h @@ -64,8 +64,8 @@ public: INLINE void enable_pointer_events(); INLINE void disable_pointer_events(); - INLINE void enable_pointer_mode(double speed); - INLINE void disable_pointer_mode(); + void enable_pointer_mode(double speed); + void disable_pointer_mode(); bool has_button_event() const; ButtonEvent get_button_event(); diff --git a/panda/src/event/pointerEventList.cxx b/panda/src/event/pointerEventList.cxx index bc17d70bd4..466a07299d 100644 --- a/panda/src/event/pointerEventList.cxx +++ b/panda/src/event/pointerEventList.cxx @@ -67,7 +67,7 @@ write(ostream &out, int indent_level) const { // Automatically calculates the dx, dy, length, // direction, and rotation for all but the first event. //////////////////////////////////////////////////////////////////// -INLINE void PointerEventList:: +void PointerEventList:: add_event(bool in_win, int xpos, int ypos, int seq, double time) { PointerEvent pe; pe._in_window = in_win; diff --git a/panda/src/event/pointerEventList.h b/panda/src/event/pointerEventList.h index 253b02ef50..b5e16596a5 100644 --- a/panda/src/event/pointerEventList.h +++ b/panda/src/event/pointerEventList.h @@ -56,10 +56,10 @@ PUBLISHED: INLINE void clear(); INLINE void pop_front(); - INLINE void add_event(bool in_win, int xpos, int ypos, int seq, double time); + void add_event(bool in_win, int xpos, int ypos, int seq, double time); - INLINE bool encircles(int x, int y) const; - INLINE double total_turns(double sec) const; + bool encircles(int x, int y) const; + double total_turns(double sec) const; public: INLINE PointerEventList(const PointerEventList ©);