mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-01 01:07:51 -04:00
display: Remove obsolete mouse_mode_relative/absolute methods
This commit is contained in:
parent
199b797d72
commit
0e219fa5c9
@ -71,9 +71,6 @@ protected:
|
|||||||
CFMutableArrayRef find_display_modes(int width, int height);
|
CFMutableArrayRef find_display_modes(int width, int height);
|
||||||
bool do_switch_fullscreen(CGDisplayModeRef mode);
|
bool do_switch_fullscreen(CGDisplayModeRef mode);
|
||||||
|
|
||||||
virtual void mouse_mode_absolute();
|
|
||||||
virtual void mouse_mode_relative();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
NSData *load_image_data(const Filename &filename);
|
NSData *load_image_data(const Filename &filename);
|
||||||
NSImage *load_image(const Filename &filename);
|
NSImage *load_image(const Filename &filename);
|
||||||
|
@ -693,7 +693,7 @@ open_window() {
|
|||||||
// Enable relative mouse mode, if this was requested.
|
// Enable relative mouse mode, if this was requested.
|
||||||
if (_properties.has_mouse_mode() &&
|
if (_properties.has_mouse_mode() &&
|
||||||
_properties.get_mouse_mode() == WindowProperties::M_relative) {
|
_properties.get_mouse_mode() == WindowProperties::M_relative) {
|
||||||
mouse_mode_relative();
|
CGAssociateMouseAndMouseCursorPosition(NO);
|
||||||
}
|
}
|
||||||
|
|
||||||
_vsync_enabled = sync_video && cocoagsg->setup_vsync();
|
_vsync_enabled = sync_video && cocoagsg->setup_vsync();
|
||||||
@ -747,22 +747,6 @@ close_window() {
|
|||||||
GraphicsWindow::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
|
* Applies the requested set of properties to the window, if possible, for
|
||||||
* instance to request a change in size or minimization status.
|
* instance to request a change in size or minimization status.
|
||||||
|
@ -696,23 +696,6 @@ add_input_device(InputDevice *device) {
|
|||||||
return index;
|
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.
|
* Returns whether the specified event msg is a touch message.
|
||||||
*
|
*
|
||||||
|
@ -130,9 +130,6 @@ protected:
|
|||||||
virtual bool do_reshape_request(int x_origin, int y_origin, bool has_origin,
|
virtual bool do_reshape_request(int x_origin, int y_origin, bool has_origin,
|
||||||
int x_size, int y_size);
|
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
|
// It is an error to call any of the following methods from any thread other
|
||||||
// than the window thread.
|
// than the window thread.
|
||||||
void system_changed_properties(const WindowProperties &properties);
|
void system_changed_properties(const WindowProperties &properties);
|
||||||
|
@ -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.
|
* Closes the window right now. Called from the window thread.
|
||||||
*/
|
*/
|
||||||
|
@ -50,9 +50,6 @@ protected:
|
|||||||
virtual void close_window();
|
virtual void close_window();
|
||||||
virtual bool open_window();
|
virtual bool open_window();
|
||||||
|
|
||||||
virtual void mouse_mode_absolute();
|
|
||||||
virtual void mouse_mode_relative();
|
|
||||||
|
|
||||||
void set_wm_properties(const WindowProperties &properties,
|
void set_wm_properties(const WindowProperties &properties,
|
||||||
bool already_mapped);
|
bool already_mapped);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user