Merge branch 'optional_q3map2_type' into 'master'

[xonotic/netradiant.git] / radiant / groupdialog.h

diff --git a/radiant/groupdialog.h b/radiant/groupdialog.h
index 50e880b4c6f9725dcddfbfdcb6650c5222464753..63f36a02526df4d1c48c601da9a7dc4aec3add5b 100644 (file)
--- a/radiant/groupdialog.h
+++ b/radiant/groupdialog.h
@@ -23,25 +23,37 @@
 #define INCLUDED_GROUPDIALOG_H
 
 #include <uilib/uilib.h>
+#include "property.h"
 #include "generic/callback.h"
 
 void GroupDialog_Construct();
+
 void GroupDialog_Destroy();
 
-void GroupDialog_constructWindow( ui::Window main_window );
+void GroupDialog_constructWindow(ui::Window main_window);
+
 void GroupDialog_destroyWindow();
+
 ui::Window GroupDialog_getWindow();
+
 void GroupDialog_show();
 
-inline void RawStringExport( const char* string, const StringImportCallback& importer ){
-       importer( string );
+inline void RawStringExport(const char *string, const Callback<void(const char *)> &importer)
+{
+    importer(string);
 }
-typedef ConstPointerCaller1<char, const StringImportCallback&, RawStringExport> RawStringExportCaller;
-ui::Widget GroupDialog_addPage( const char* tabLabel, ui::Widget widget, const StringExportCallback& title );
 
-void GroupDialog_showPage( ui::Widget page );
-void GroupDialog_updatePageTitle( ui::Widget page );
+typedef ConstPointerCaller<char, void(const Callback<void(const char *)> &), RawStringExport> RawStringExportCaller;
+
+ui::Widget GroupDialog_addPage(const char *tabLabel, ui::Widget widget,
+                               const Callback<void(const Callback<void(const char *)> &)> &title);
+
+void GroupDialog_showPage(ui::Widget page);
+
+void GroupDialog_updatePageTitle(ui::Widget page);
+
 bool GroupDialog_isShown();
+
 ui::Widget GroupDialog_getPage();
 
 #endif