X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=contrib%2Fcamera%2Fdialogs_common.cpp;h=d44547a96db7cf54ca2b15476540cae5a1db9aa0;hb=9dfae1c9b270ee369c6362903a9205b30751b95f;hp=ed21f5b4161d55a104a1f7a2fe5910752566bc64;hpb=b1bfb19ecd5ec8355065b2028a6de0c850197b2d;p=xonotic%2Fnetradiant.git

diff --git a/contrib/camera/dialogs_common.cpp b/contrib/camera/dialogs_common.cpp
index ed21f5b4..d44547a9 100644
--- a/contrib/camera/dialogs_common.cpp
+++ b/contrib/camera/dialogs_common.cpp
@@ -1,51 +1,50 @@
 /*
-Copyright (C) 1999-2007 id Software, Inc. and contributors.
-For a list of contributors, see the accompanying CONTRIBUTORS file.
+   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.
+   This file is part of GtkRadiant.
 
-GtkRadiant is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   GtkRadiant is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-GtkRadiant is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   GtkRadiant is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU General Public License
+   along with GtkRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 /*
-Camera plugin for GtkRadiant
-Copyright (C) 2002 Splash Damage Ltd.
-*/
+   Camera plugin for GtkRadiant
+   Copyright (C) 2002 Splash Damage Ltd.
+ */
 
 #include "camera.h"
 
-void dialog_button_callback (GtkWidget *widget, gpointer data)
+void dialog_button_callback(ui::Widget widget, gpointer data)
 {
-	GtkWidget *parent;
-	int *loop, *ret;
- 
-	parent = gtk_widget_get_toplevel (widget);
-	loop = (int*)g_object_get_data (G_OBJECT (parent), "loop");
-	ret = (int*)g_object_get_data (G_OBJECT (parent), "ret");
- 
-	*loop = 0;
-	*ret = (int)data;
+    int *loop, *ret;
+
+    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);
 }
 
-gint dialog_delete_callback (GtkWidget *widget, GdkEvent* event, gpointer data)
+gint dialog_delete_callback(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
-	int *loop;
- 
-	gtk_widget_hide (widget);
-	loop = (int*)g_object_get_data (G_OBJECT (widget), "loop");
-	*loop = 0;
+    int *loop;
+
+    gtk_widget_hide(widget);
+    loop = (int *) g_object_get_data(G_OBJECT(widget), "loop");
+    *loop = 0;
 
-	return TRUE;
+    return TRUE;
 }