quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make it work with older Gtk again

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@229 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-03-25 11:49:50 +00:00
parent 2a41079750
commit 8e10595ce3
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/gtkutil/accelerator.h
View File

@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "generic/callback.h" #include "generic/callback.h"
// ignore numlock // ignore numlock
#define ALLOWED_MODIFIERS (~(GDK_MOD2_MASK | GDK_LOCK_MASK)) #define ALLOWED_MODIFIERS (~(GDK_MOD2_MASK | GDK_LOCK_MASK | GDK_MOD3_MASK | GDK_MOD4_MASK | GDK_MOD5_MASK))
struct Accelerator struct Accelerator
{ {

24
radiant/commands.cpp
View File

@ -263,8 +263,31 @@ gboolean accelerator_window_key_press(GtkWidget *widget, GdkEventKey *event, gpo
if(!dialog.m_waiting_for_key) if(!dialog.m_waiting_for_key)
return false; return false;
#if 0
if(event->is_modifier) if(event->is_modifier)
return false; return false;
#else
switch(event->keyval)
{
case GDK_Shift_L:
case GDK_Shift_R:
case GDK_Control_L:
case GDK_Control_R:
case GDK_Caps_Lock:
case GDK_Shift_Lock:
case GDK_Meta_L:
case GDK_Meta_R:
case GDK_Alt_L:
case GDK_Alt_R:
case GDK_Super_L:
case GDK_Super_R:
case GDK_Hyper_L:
case GDK_Hyper_R:
return false;
}
#endif
dialog.m_waiting_for_key = false; dialog.m_waiting_for_key = false;
// 7. find the name of the accelerator // 7. find the name of the accelerator
@ -560,7 +583,6 @@ public:
accelerator.modifiers = (GdkModifierType)0; accelerator.modifiers = (GdkModifierType)0;
return; return;
} }
int modifiers = 0;
gtk_accelerator_parse(value, &accelerator.key, &accelerator.modifiers); gtk_accelerator_parse(value, &accelerator.key, &accelerator.modifiers);
accelerator = accelerator; // fix modifiers accelerator = accelerator; // fix modifiers