X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Fgtkmisc.cpp;h=6b54918018de2cdd0b2c8f6743426e6dda325b05;hp=63d5bf75a82e1b77538d411c6bd4ff63e4176b6f;hb=a54ff4a83e324df7206626a0e8a10951e46c4fb3;hpb=c974ae628c05911cb62c0f4f5b31f0e00f7391af diff --git a/radiant/gtkmisc.cpp b/radiant/gtkmisc.cpp index 63d5bf75..6b549180 100644 --- a/radiant/gtkmisc.cpp +++ b/radiant/gtkmisc.cpp @@ -859,7 +859,7 @@ void dialog_button_callback( GtkWidget *widget, gpointer data ) { ret = (int*)g_object_get_data( G_OBJECT( parent ), "ret" ); *loop = 0; - *ret = (int)data; + *ret = GPOINTER_TO_INT (data); } gint dialog_delete_callback (GtkWidget *widget, GdkEvent* event, gpointer data) @@ -1037,7 +1037,7 @@ static void file_sel_callback (GtkWidget *widget, gpointer data) loop = (int*)g_object_get_data (G_OBJECT (parent), "loop"); success = (bool*)g_object_get_data (G_OBJECT (parent), "success"); - if ((int)data == IDOK) + if (GPOINTER_TO_INT (data) == IDOK) *success = true; #ifdef FILEDLG_DBG @@ -1474,8 +1474,9 @@ char* WINAPI dir_dialog (void *parent, const char* title, const char* path) GTK_SIGNAL_FUNC (dialog_delete_callback), NULL); gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (file_sel)); - if (parent != NULL) - gtk_window_set_transient_for (GTK_WINDOW (file_sel), GTK_WINDOW (parent)); + if ( parent != NULL ) { + gtk_window_set_transient_for( GTK_WINDOW( file_sel ), GTK_WINDOW( parent ) ); + } gtk_widget_hide (GTK_FILE_SELECTION (file_sel)->file_list->parent); @@ -1491,10 +1492,10 @@ char* WINAPI dir_dialog (void *parent, const char* title, const char* path) while (loop) gtk_main_iteration (); - filename = g_strdup(gtk_file_selection_get_filename (GTK_FILE_SELECTION (file_sel))); + filename = g_strdup( gtk_file_selection_get_filename( GTK_FILE_SELECTION( file_sel ) ) ); - gtk_grab_remove (file_sel); - gtk_widget_destroy (file_sel); + gtk_grab_remove( file_sel ); + gtk_widget_destroy( file_sel ); return filename; }