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

Replace GDK_<keyname> with GDK_KEY_<keyname>

Browse Source
This commit is contained in:
Garux
2020-05-19 21:15:11 +03:00
parent a0a47640b0
commit 0831e0966d
21 changed files with 141 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/gtkutil/accelerator.cpp
View File

@@ -57,7 +57,7 @@ unsigned int global_keys_find( const char* name ){
return 0;
}
k = gdk_keyval_from_name( name );
if ( k == GDK_VoidSymbol ) {
if ( k == GDK_KEY_VoidSymbol ) {
return 0;
}
return k;
@@ -109,8 +109,8 @@ bool accelerator_map_erase( AcceleratorMap& acceleratorMap, Accelerator accelera
}
Accelerator accelerator_for_event_key( guint keyval, guint state ){
if ( keyval == GDK_ISO_Left_Tab ) {
keyval = GDK_Tab;
if ( keyval == GDK_KEY_ISO_Left_Tab ) {
keyval = GDK_KEY_Tab;
}
return Accelerator( keyval, (GdkModifierType)( state & gtk_accelerator_get_default_mod_mask() ) );
}

2
libs/gtkutil/dialog.cpp
View File

@@ -186,7 +186,7 @@ GtkWindow* create_simple_modal_dialog_window( const char* title, ModalDialog& di
GtkButton* button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &dialog );
gtk_container_add( GTK_CONTAINER( alignment ), GTK_WIDGET( button ) );
gtk_widget_grab_default( GTK_WIDGET( button ) );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
return window;
}

8
libs/gtkutil/messagebox.cpp
View File

@@ -118,8 +118,8 @@ EMessageBoxReturn gtk_MessageBox( GtkWidget *parent, const char* text, const cha
if ( type == eMB_OK ) {
GtkButton* button = create_modal_dialog_button( "OK", ok_button );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
widget_make_default( GTK_WIDGET( button ) );
gtk_widget_show( GTK_WIDGET( button ) );
@@ -129,7 +129,7 @@ EMessageBoxReturn gtk_MessageBox( GtkWidget *parent, const char* text, const cha
{
GtkButton* button = create_modal_dialog_button( "OK", ok_button );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
widget_make_default( GTK_WIDGET( button ) );
gtk_widget_show( GTK_WIDGET( button ) );
}
@@ -137,7 +137,7 @@ EMessageBoxReturn gtk_MessageBox( GtkWidget *parent, const char* text, const cha
{
GtkButton* button = create_modal_dialog_button( "Cancel", cancel_button );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
gtk_widget_show( GTK_WIDGET( button ) );
}

10
libs/gtkutil/nonmodal.h
View File

@@ -36,7 +36,7 @@ typedef struct _GtkEntry GtkEntry;
inline gboolean escape_clear_focus_widget( GtkWidget* widget, GdkEventKey* event, gpointer data ){
if ( event->keyval == GDK_Escape ) {
if ( event->keyval == GDK_KEY_Escape ) {
gtk_window_set_focus( GTK_WINDOW( gtk_widget_get_toplevel( GTK_WIDGET( widget ) ) ), NULL );
return TRUE;
}
@@ -73,7 +73,7 @@ static gboolean changed( GtkEntry* entry, NonModalEntry* self ){
}
static gboolean enter( GtkEntry* entry, GdkEventKey* event, NonModalEntry* self ){
if ( event->keyval == GDK_Return ) {
if ( event->keyval == GDK_KEY_Return ) {
self->m_apply();
self->m_editing = false;
gtk_window_set_focus( GTK_WINDOW( gtk_widget_get_toplevel( GTK_WIDGET( entry ) ) ), NULL );
@@ -83,7 +83,7 @@ static gboolean enter( GtkEntry* entry, GdkEventKey* event, NonModalEntry* self
}
static gboolean escape( GtkEntry* entry, GdkEventKey* event, NonModalEntry* self ){
if ( event->keyval == GDK_Escape ) {
if ( event->keyval == GDK_KEY_Escape ) {
self->m_cancel();
self->m_editing = false;
gtk_window_set_focus( GTK_WINDOW( gtk_widget_get_toplevel( GTK_WIDGET( entry ) ) ), NULL );
@@ -116,7 +116,7 @@ static gboolean changed( GtkSpinButton* spin, NonModalSpinner* self ){
}
static gboolean enter( GtkSpinButton* spin, GdkEventKey* event, NonModalSpinner* self ){
if ( event->keyval == GDK_Return ) {
if ( event->keyval == GDK_KEY_Return ) {
gtk_window_set_focus( GTK_WINDOW( gtk_widget_get_toplevel( GTK_WIDGET( spin ) ) ), NULL );
return TRUE;
}
@@ -124,7 +124,7 @@ static gboolean enter( GtkSpinButton* spin, GdkEventKey* event, NonModalSpinner*
}
static gboolean escape( GtkSpinButton* spin, GdkEventKey* event, NonModalSpinner* self ){
if ( event->keyval == GDK_Escape ) {
if ( event->keyval == GDK_KEY_Escape ) {
self->m_cancel();
gtk_window_set_focus( GTK_WINDOW( gtk_widget_get_toplevel( GTK_WIDGET( spin ) ) ), NULL );
return TRUE;