Merge branch 'NateEag-master-patch-12920' into 'master'

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

diff --git a/radiant/groupdialog.h b/radiant/groupdialog.h
index f1a2e86b07efc76a132bfdc52162a0b23277fe3a..f136f382c02f116f2c62123f5467f6f315a51b11 100644 (file)
--- a/radiant/groupdialog.h
+++ b/radiant/groupdialog.h
@@ -23,6 +23,7 @@
 #define INCLUDED_GROUPDIALOG_H
 
 #include <uilib/uilib.h>
+#include "property.h"
 #include "generic/callback.h"
 
 void GroupDialog_Construct();
@@ -33,11 +34,11 @@ void GroupDialog_destroyWindow();
 ui::Window GroupDialog_getWindow();
 void GroupDialog_show();
 
-inline void RawStringExport( const char* string, const StringImportCallback& importer ){
+inline void RawStringExport( const char* string, const Callback<void(const char *)> &importer ){
        importer( string );
 }
-typedef ConstPointerCaller<char, void(const StringImportCallback&), RawStringExport> RawStringExportCaller;
-ui::Widget GroupDialog_addPage( const char* tabLabel, ui::Widget widget, const StringExportCallback& title );
+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 );