diff --git a/panda/src/glxdisplay/config_glxdisplay.cxx b/panda/src/glxdisplay/config_glxdisplay.cxx index 12dbbe6ad6..b65d1a28e7 100644 --- a/panda/src/glxdisplay/config_glxdisplay.cxx +++ b/panda/src/glxdisplay/config_glxdisplay.cxx @@ -29,17 +29,6 @@ ConfigureFn(config_glxdisplay) { init_libglxdisplay(); } -ConfigVariableString display_cfg -("display", "", - PRC_DESC("Specify the X display string for the default display. If this " - "is not specified, $DISPLAY is used.")); - -ConfigVariableBool x_error_abort -("x-error-abort", false, - PRC_DESC("Set this true to trigger and abort (and a stack trace) on receipt " - "of an error from the X window system. This can make it easier " - "to discover where these errors are generated.")); - ConfigVariableBool glx_get_proc_address ("glx-get-proc-address", true, PRC_DESC("Set this to true to allow the use of glxGetProcAddress(), if " @@ -54,30 +43,6 @@ ConfigVariableBool glx_get_os_address "addresses of extension functions. This will be done only " "if glxGetProcAddress() cannot be used for some reason.")); -ConfigVariableInt x_wheel_up_button -("x-wheel-up-button", 4, - PRC_DESC("This is the mouse button index of the wheel_up event: which " - "mouse button number does the system report when the mouse wheel " - "is rolled one notch up?")); - -ConfigVariableInt x_wheel_down_button -("x-wheel-down-button", 5, - PRC_DESC("This is the mouse button index of the wheel_down event: which " - "mouse button number does the system report when the mouse wheel " - "is rolled one notch down?")); - -ConfigVariableInt x_wheel_left_button -("x-wheel-left-button", 6, - PRC_DESC("This is the mouse button index of the wheel_left event: which " - "mouse button number does the system report when one scrolls " - "to the left?")); - -ConfigVariableInt x_wheel_right_button -("x-wheel-right-button", 7, - PRC_DESC("This is the mouse button index of the wheel_right event: which " - "mouse button number does the system report when one scrolls " - "to the right?")); - ConfigVariableBool glx_support_pbuffer ("glx-support-pbuffer", false, PRC_DESC("Set this true to enable the use of X pbuffer-based offscreen " diff --git a/panda/src/glxdisplay/config_glxdisplay.h b/panda/src/glxdisplay/config_glxdisplay.h index 94749acd98..7bd64e31b0 100644 --- a/panda/src/glxdisplay/config_glxdisplay.h +++ b/panda/src/glxdisplay/config_glxdisplay.h @@ -25,16 +25,9 @@ NotifyCategoryDecl(glxdisplay, EXPCL_PANDAGL, EXPTP_PANDAGL); extern EXPCL_PANDAGL void init_libglxdisplay(); -extern ConfigVariableString display_cfg; -extern ConfigVariableBool x_error_abort; extern ConfigVariableBool glx_get_proc_address; extern ConfigVariableBool glx_get_os_address; -extern ConfigVariableInt x_wheel_up_button; -extern ConfigVariableInt x_wheel_down_button; -extern ConfigVariableInt x_wheel_left_button; -extern ConfigVariableInt x_wheel_right_button; - extern ConfigVariableBool glx_support_pbuffer; extern ConfigVariableBool glx_support_pixmap;