Revert partially (auto) "reformat code! now the code is only ugly on the *inside*"

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

diff --git a/radiant/brushmanip.h b/radiant/brushmanip.h
index 06f672710fd1f193b35497d2fb311f40f034e4ac..5a1f62b00cd060894501d61753ecafb602427d5e 100644 (file)
--- a/radiant/brushmanip.h
+++ b/radiant/brushmanip.h
@@ -23,8 +23,9 @@
 #define INCLUDED_BRUSHWRAPPER_H
 
 #include <cstddef>
+#include <uilib/uilib.h>
 #include "string/stringfwd.h"
-#include "generic/callbackfwd.h"
+#include "generic/callback.h"
 
 enum EBrushPrefab
 {
@@ -71,10 +72,9 @@ void Scene_BrushSelectByShader_Component( scene::Graph& graph, const char* name
 void Scene_BrushFitTexture_Selected( scene::Graph& graph, float s_repeat, float t_repeat );
 void Scene_BrushFitTexture_Component_Selected( scene::Graph& graph, float s_repeat, float t_repeat );
 
-typedef struct _GtkMenu GtkMenu;
-void Brush_constructMenu( GtkMenu* menu );
+void Brush_constructMenu( ui::Menu menu );
 
-extern Callback g_texture_lock_status_changed;
+extern Callback<void()> g_texture_lock_status_changed;
 
 void BrushFilters_construct();
 void Brush_registerCommands();