From 0e219fa5c9c045fb7cf6e5135192549335511344 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Fri, 2 Jul 2021 16:00:41 +0200
Subject: [PATCH] display: Remove obsolete mouse_mode_relative/absolute methods

---
 panda/src/cocoadisplay/cocoaGraphicsWindow.h  |  3 ---
 panda/src/cocoadisplay/cocoaGraphicsWindow.mm | 18 +-----------------
 panda/src/display/graphicsWindow.cxx          | 17 -----------------
 panda/src/display/graphicsWindow.h            |  3 ---
 panda/src/x11display/x11GraphicsWindow.cxx    | 16 ----------------
 panda/src/x11display/x11GraphicsWindow.h      |  3 ---
 6 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/panda/src/cocoadisplay/cocoaGraphicsWindow.h b/panda/src/cocoadisplay/cocoaGraphicsWindow.h
index 711e6e4f27..13aee0e5b0 100644
--- a/panda/src/cocoadisplay/cocoaGraphicsWindow.h
+++ b/panda/src/cocoadisplay/cocoaGraphicsWindow.h
@@ -71,9 +71,6 @@ protected:
   CFMutableArrayRef find_display_modes(int width, int height);
   bool do_switch_fullscreen(CGDisplayModeRef mode);
 
-  virtual void mouse_mode_absolute();
-  virtual void mouse_mode_relative();
-
 private:
   NSData *load_image_data(const Filename &filename);
   NSImage *load_image(const Filename &filename);
diff --git a/panda/src/cocoadisplay/cocoaGraphicsWindow.mm b/panda/src/cocoadisplay/cocoaGraphicsWindow.mm
index d0b4d4c9f1..0f4acf7a83 100644
--- a/panda/src/cocoadisplay/cocoaGraphicsWindow.mm
+++ b/panda/src/cocoadisplay/cocoaGraphicsWindow.mm
@@ -693,7 +693,7 @@ open_window() {
   // Enable relative mouse mode, if this was requested.
   if (_properties.has_mouse_mode() &&
       _properties.get_mouse_mode() == WindowProperties::M_relative) {
-    mouse_mode_relative();
+    CGAssociateMouseAndMouseCursorPosition(NO);
   }
 
   _vsync_enabled = sync_video && cocoagsg->setup_vsync();
@@ -747,22 +747,6 @@ close_window() {
   GraphicsWindow::close_window();
 }
 
-/**
- * Overridden from GraphicsWindow.
- */
-void CocoaGraphicsWindow::
-mouse_mode_absolute() {
-  CGAssociateMouseAndMouseCursorPosition(YES);
-}
-
-/**
- * Overridden from GraphicsWindow.
- */
-void CocoaGraphicsWindow::
-mouse_mode_relative() {
-  CGAssociateMouseAndMouseCursorPosition(NO);
-}
-
 /**
  * Applies the requested set of properties to the window, if possible, for
  * instance to request a change in size or minimization status.
diff --git a/panda/src/display/graphicsWindow.cxx b/panda/src/display/graphicsWindow.cxx
index e7a7a09cbd..7abda2bac7 100644
--- a/panda/src/display/graphicsWindow.cxx
+++ b/panda/src/display/graphicsWindow.cxx
@@ -696,23 +696,6 @@ add_input_device(InputDevice *device) {
   return index;
 }
 
-/**
- * detaches mouse.  Only mouse delta from now on.
- *
- */
-void GraphicsWindow::
-mouse_mode_relative() {
-}
-
-/**
- * reattaches mouse to location
- *
- */
-void GraphicsWindow::
-mouse_mode_absolute() {
-
-}
-
 /**
  * Returns whether the specified event msg is a touch message.
  *
diff --git a/panda/src/display/graphicsWindow.h b/panda/src/display/graphicsWindow.h
index 074aa8a41f..3424ec710f 100644
--- a/panda/src/display/graphicsWindow.h
+++ b/panda/src/display/graphicsWindow.h
@@ -130,9 +130,6 @@ protected:
   virtual bool do_reshape_request(int x_origin, int y_origin, bool has_origin,
                                   int x_size, int y_size);
 
-  virtual void mouse_mode_absolute();
-  virtual void mouse_mode_relative();
-
   // It is an error to call any of the following methods from any thread other
   // than the window thread.
   void system_changed_properties(const WindowProperties &properties);
diff --git a/panda/src/x11display/x11GraphicsWindow.cxx b/panda/src/x11display/x11GraphicsWindow.cxx
index c6739c3bf3..c8e752700e 100644
--- a/panda/src/x11display/x11GraphicsWindow.cxx
+++ b/panda/src/x11display/x11GraphicsWindow.cxx
@@ -1049,22 +1049,6 @@ set_properties_now(WindowProperties &properties) {
   }
 }
 
-/**
- * Overridden from GraphicsWindow.
- */
-void x11GraphicsWindow::
-mouse_mode_absolute() {
-  // unused: remove in 1.10!
-}
-
-/**
- * Overridden from GraphicsWindow.
- */
-void x11GraphicsWindow::
-mouse_mode_relative() {
-  // unused: remove in 1.10!
-}
-
 /**
  * Closes the window right now.  Called from the window thread.
  */
diff --git a/panda/src/x11display/x11GraphicsWindow.h b/panda/src/x11display/x11GraphicsWindow.h
index e3d4a86382..e8787ae574 100644
--- a/panda/src/x11display/x11GraphicsWindow.h
+++ b/panda/src/x11display/x11GraphicsWindow.h
@@ -50,9 +50,6 @@ protected:
   virtual void close_window();
   virtual bool open_window();
 
-  virtual void mouse_mode_absolute();
-  virtual void mouse_mode_relative();
-
   void set_wm_properties(const WindowProperties &properties,
                          bool already_mapped);