TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 01:44:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

whoops, typos in merge

Browse Source
This commit is contained in:
David Rose 2009-03-06 22:07:22 +00:00
parent 5ff71bc8df
commit 30671d09a8
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
panda/src/tinydisplay/config_tinydisplay.cxx
View File

@ -60,6 +60,18 @@ ConfigVariableInt x_wheel_down_button
"mouse button number does the system report when the mouse wheel " "mouse button number does the system report when the mouse wheel "
"is rolled one notch down?")); "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 show_resize_box ConfigVariableBool show_resize_box
("show-resize-box", true, ("show-resize-box", true,
PRC_DESC("When this variable is true, then resizable OSX Panda windows will " PRC_DESC("When this variable is true, then resizable OSX Panda windows will "

2
panda/src/tinydisplay/config_tinydisplay.h
View File

@ -30,6 +30,8 @@ extern ConfigVariableString display_cfg;
extern ConfigVariableBool x_error_abort; extern ConfigVariableBool x_error_abort;
extern ConfigVariableInt x_wheel_up_button; extern ConfigVariableInt x_wheel_up_button;
extern ConfigVariableInt x_wheel_down_button; extern ConfigVariableInt x_wheel_down_button;
extern ConfigVariableInt x_wheel_left_button;
extern ConfigVariableInt x_wheel_right_button;
extern ConfigVariableBool show_resize_box; extern ConfigVariableBool show_resize_box;
extern ConfigVariableBool osx_disable_event_loop; extern ConfigVariableBool osx_disable_event_loop;

4
panda/src/tinydisplay/tinyXGraphicsWindow.cxx
View File

@ -1398,12 +1398,12 @@ get_button(XKeyEvent &key_event, bool allow_shift) {
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: glxGraphicsWindow::map_button // Function: TinyXGraphicsWindow::map_button
// Access: Private // Access: Private
// Description: Maps from a single X keysym to Panda's ButtonHandle. // Description: Maps from a single X keysym to Panda's ButtonHandle.
// Called by get_button(), above. // Called by get_button(), above.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
ButtonHandle glxGraphicsWindow:: ButtonHandle TinyXGraphicsWindow::
map_button(KeySym key) { map_button(KeySym key) {
switch (key) { switch (key) {
case XK_BackSpace: case XK_BackSpace: