From e1bb249176284df5d0ea86f5e26a62d395fc1a72 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 20 Dec 2014 04:36:09 +0000 Subject: [PATCH] Remove unused UI_GADGET_KEYTRAP --- SConstruct | 1 - common/include/ui.h | 10 -------- common/ui/gadget.cpp | 5 ---- common/ui/keytrap.cpp | 55 ------------------------------------------- 4 files changed, 71 deletions(-) delete mode 100644 common/ui/keytrap.cpp diff --git a/SConstruct b/SConstruct index 73b824cad..4fb99265f 100644 --- a/SConstruct +++ b/SConstruct @@ -1470,7 +1470,6 @@ class DXXArchive(DXXCommon): 'ui/inputbox.cpp', 'ui/keypad.cpp', 'ui/keypress.cpp', -'ui/keytrap.cpp', 'ui/listbox.cpp', 'ui/menu.cpp', 'ui/menubar.cpp', diff --git a/common/include/ui.h b/common/include/ui.h index e7dc4f51d..479cdd2a9 100644 --- a/common/include/ui.h +++ b/common/include/ui.h @@ -77,13 +77,6 @@ struct UI_GADGET short x1,y1,x2,y2; }; -struct UI_GADGET_KEYTRAP : UI_GADGET -{ - static const uint8_t s_kind = 8; - int trap_key; - int (*user_function)(void); -}; - struct UI_GADGET_USERBOX : UI_GADGET { static const uint8_t s_kind = 7; @@ -367,9 +360,6 @@ int ui_get_filename( char * filename, const char * Filespec, const char * messag void * ui_malloc( int size ); void ui_free( void * buffer ); -UI_GADGET_KEYTRAP * ui_add_gadget_keytrap( UI_DIALOG * dlg, int key_to_trap, int (*function_to_call)(void) ); -window_event_result ui_keytrap_do( UI_GADGET_KEYTRAP * keytrap, const d_event &event ); - #define UI_RECORD_MOUSE 1 #define UI_RECORD_KEYS 2 #define UI_STATUS_NORMAL 0 diff --git a/common/ui/gadget.cpp b/common/ui/gadget.cpp index 929fd0270..d825f6266 100644 --- a/common/ui/gadget.cpp +++ b/common/ui/gadget.cpp @@ -113,9 +113,6 @@ void ui_gadget_delete_all( UI_DIALOG * dlg ) case UI_GADGET_USERBOX::s_kind: delete static_cast(tmp); break; - case UI_GADGET_KEYTRAP::s_kind: - delete static_cast(tmp); - break; case UI_GADGET_ICON::s_kind: /* Handled by returned unique_ptr */ break; @@ -197,8 +194,6 @@ static window_event_result ui_gadget_do(UI_DIALOG *dlg, UI_GADGET *g,const d_eve return ui_inputbox_do(dlg, (UI_GADGET_INPUTBOX *)g, event); case UI_GADGET_USERBOX::s_kind: return ui_userbox_do(dlg, (UI_GADGET_USERBOX *)g, event); - case UI_GADGET_KEYTRAP::s_kind: - return ui_keytrap_do((UI_GADGET_KEYTRAP *)g, event); case UI_GADGET_ICON::s_kind: return ui_icon_do(dlg, (UI_GADGET_ICON *)g, event); } diff --git a/common/ui/keytrap.cpp b/common/ui/keytrap.cpp deleted file mode 100644 index b492f501a..000000000 --- a/common/ui/keytrap.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Portions of this file are copyright Rebirth contributors and licensed as - * described in COPYING.txt. - * Portions of this file are copyright Parallax Software and licensed - * according to the Parallax license below. - * See COPYING.txt for license details. - -THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX -SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO -END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A -ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS -IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS -SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE -FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE -CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. -COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. -*/ - -#include -#include - -#include "maths.h" -#include "pstypes.h" -#include "event.h" -#include "gr.h" -#include "ui.h" -#include "key.h" - - -UI_GADGET_KEYTRAP * ui_add_gadget_keytrap( UI_DIALOG * dlg, int key_to_trap, int (*function_to_call)(void) ) -{ - auto keytrap = ui_gadget_add( dlg, 0, 0, 0, 0 ); - keytrap->parent = keytrap; - - keytrap->trap_key = key_to_trap; - keytrap->user_function = function_to_call; - - return keytrap; - -} - -window_event_result ui_keytrap_do( UI_GADGET_KEYTRAP * keytrap,const d_event &event ) -{ - int keypress = 0; - if (event.type == EVENT_KEY_COMMAND) - keypress = event_key_get(event); - - if ( keypress == keytrap->trap_key ) - { - keytrap->user_function(); - return window_event_result::handled; - } - return window_event_result::ignored; -}