h2data: use static for homonyms

[xonotic/netradiant.git] / contrib / camera / dialogs_common.cpp

diff --git a/contrib/camera/dialogs_common.cpp b/contrib/camera/dialogs_common.cpp
index e9d019fd2989a60aa8b385e725330ea09a1f2550..805071cabe0cefcaabacd23ae98796c0201531b4 100644 (file)
--- a/contrib/camera/dialogs_common.cpp
+++ b/contrib/camera/dialogs_common.cpp
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1999-2007 id Software, Inc. and contributors.
+   Copyright (C) 1999-2006 Id Software, Inc. and contributors.
    For a list of contributors, see the accompanying CONTRIBUTORS file.
 
    This file is part of GtkRadiant.
@@ -26,16 +26,15 @@
 
 #include "camera.h"
 
-void dialog_button_callback( GtkWidget *widget, gpointer data ){
-       GtkWidget *parent;
+void dialog_button_callback( ui::Widget widget, gpointer data ){
        int *loop, *ret;
 
-       parent = gtk_widget_get_toplevel( widget );
+       auto parent = widget.window();
        loop = (int*)g_object_get_data( G_OBJECT( parent ), "loop" );
        ret = (int*)g_object_get_data( G_OBJECT( parent ), "ret" );
 
        *loop = 0;
-       *ret = GPOINTER_TO_INT( data );
+       *ret = gpointer_to_int( data );
 }
 
 gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){