ioquake
/
gtkradiant
mirror of https://github.com/TTimo/GtkRadiant.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #506 from Pan7/deprGdkDisplay 

Replace deprecated GDK_DISPLAY with gdk_x11_get_default_xdisplay
This commit is contained in:
Timothee "TTimo" Besset 2017-05-27 18:20:51 -05:00 committed by GitHub
parent e02a9194b7 23018aaf4d
commit 94fa9fd42f
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
radiant/main.cpp
View File

@ -861,7 +861,7 @@ int mainRadiant( int argc, char* argv[] ) {
}
#if defined ( __linux__ ) || defined ( __APPLE__ )
if ( ( qglXQueryExtension == NULL ) || ( qglXQueryExtension( GDK_DISPLAY(),NULL,NULL ) != True ) ) {
if ( ( qglXQueryExtension == NULL ) || ( qglXQueryExtension( gdk_x11_get_default_xdisplay(), NULL, NULL ) != True ) ) {
Sys_FPrintf( SYS_ERR, "glXQueryExtension failed\n" );
_exit( 1 );
return 1;

6
radiant/mainframe.cpp
View File

@ -2200,12 +2200,12 @@ static void clipboard_clear( GtkClipboard *clipboard, gpointer user_data_or_owne
static void clipboard_received( GtkClipboard *clipboard, GtkSelectionData *data, gpointer user_data ){
//g_Clipboard.SetLength( 0 );
if ( data->length < 0 ) {
if ( gtk_selection_data_get_length( data ) < 0 ) {
Sys_FPrintf( SYS_ERR, "Error retrieving selection\n" );
}
else if ( strcmp( gdk_atom_name( data->type ), clipboard_targets[0].target ) == 0 ) {
else if ( strcmp( gdk_atom_name( gtk_selection_data_get_data_type( data ) ), clipboard_targets[0].target ) == 0 ) {
g_Clipboard.SetLength( 0 );
g_Clipboard.Write( data->data, data->length );
g_Clipboard.Write( gtk_selection_data_get_data( data ), gtk_selection_data_get_length( data ) );
}
Clipboard_PasteMap();

16
radiant/qe3.cpp
View File

@ -1212,25 +1212,25 @@ bool Sys_AltDown(){
char keys[32];
int x;
XQueryKeymap( GDK_DISPLAY(), keys );
XQueryKeymap( gdk_x11_get_default_xdisplay(), keys );
x = XKeysymToKeycode( GDK_DISPLAY(), XK_Alt_L );
x = XKeysymToKeycode( gdk_x11_get_default_xdisplay(), XK_Alt_L );
if ( keys[x / 8] & ( 1 << ( x % 8 ) ) ) {
return true;
}
x = XKeysymToKeycode( GDK_DISPLAY(), XK_Alt_R );
x = XKeysymToKeycode( gdk_x11_get_default_xdisplay(), XK_Alt_R );
if ( keys[x / 8] & ( 1 << ( x % 8 ) ) ) {
return true;
}
// For Apple, let users use their Command keys since Alt + X11 is hosed
x = XKeysymToKeycode( GDK_DISPLAY(), XK_Meta_L );
x = XKeysymToKeycode( gdk_x11_get_default_xdisplay(), XK_Meta_L );
if ( keys[x / 8] & ( 1 << ( x % 8 ) ) ) {
return true;
}
x = XKeysymToKeycode( GDK_DISPLAY(), XK_Meta_R );
x = XKeysymToKeycode( gdk_x11_get_default_xdisplay(), XK_Meta_R );
if ( keys[x / 8] & ( 1 << ( x % 8 ) ) ) {
return true;
}
@ -1248,14 +1248,14 @@ bool Sys_ShiftDown(){
char keys[32];
int x;
XQueryKeymap( GDK_DISPLAY(), keys );
XQueryKeymap( gdk_x11_get_default_xdisplay(), keys );
x = XKeysymToKeycode( GDK_DISPLAY(), XK_Shift_L );
x = XKeysymToKeycode( gdk_x11_get_default_xdisplay(), XK_Shift_L );
if ( keys[x / 8] & ( 1 << ( x % 8 ) ) ) {
return true;
}
x = XKeysymToKeycode( GDK_DISPLAY(), XK_Shift_R );
x = XKeysymToKeycode( gdk_x11_get_default_xdisplay(), XK_Shift_R );
if ( keys[x / 8] & ( 1 << ( x % 8 ) ) ) {
return true;
}