TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove unused UI_GADGET_KEYTRAP

Browse source
This commit is contained in:
Kp 2014-12-20 04:36:09 +00:00
parent 8d487b4883
commit e1bb249176
4 changed files with 0 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
SConstruct
View file

@ -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',

10
common/include/ui.h
View file

@ -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

5
common/ui/gadget.cpp
View file

@ -113,9 +113,6 @@ void ui_gadget_delete_all( UI_DIALOG * dlg )
case UI_GADGET_USERBOX::s_kind:
delete static_cast<UI_GADGET_USERBOX *>(tmp);
break;
case UI_GADGET_KEYTRAP::s_kind:
delete static_cast<UI_GADGET_KEYTRAP *>(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);
}

55
common/ui/keytrap.cpp
View file

@ -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 <stdlib.h>
#include <string.h>
#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<UI_GADGET_KEYTRAP>( 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;
}