refactored plugin api; refactored callback library; added signals library

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

diff --git a/radiant/texwindow.h b/radiant/texwindow.h
index 4921fa0509a10997c8d27b72dc98a8e766b55e36..dd871b37be278025e3cab7349330f3689ffa31be 100644 (file)
--- a/radiant/texwindow.h
+++ b/radiant/texwindow.h
@@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define INCLUDED_TEXWINDOW_H
 
 #include "math/vector.h"
+#include "generic/callbackfwd.h"
+#include "signal/signalfwd.h"
 
 // textures menu
 
@@ -57,8 +59,6 @@ const char* TextureBrowser_GetSelectedShader(TextureBrowser& textureBrower);
 void TextureBrowser_Construct();
 void TextureBrowser_Destroy();
 
-template<typename FirstArgument>
-class Callback1;
 typedef Callback1<const char*> StringImportCallback;
 template<typename FirstArgument, void (*func)(FirstArgument)> 
 class FreeCaller1;
@@ -70,8 +70,7 @@ typedef FreeCaller1<const StringImportCallback&, TextureBrowser_exportTitle> Tex
 const Vector3& TextureBrowser_getBackgroundColour(TextureBrowser& textureBrowser);
 void TextureBrowser_setBackgroundColour(TextureBrowser& textureBrowser, const Vector3& colour);
 
-class Callback;
-void TextureBrowser_addActiveShadersChangedCallback(const Callback& callback);
-void TextureBrowser_addShadersRealiseCallback(const Callback& callback);
+void TextureBrowser_addActiveShadersChangedCallback(const SignalHandler& handler);
+void TextureBrowser_addShadersRealiseCallback(const SignalHandler& handler);
 
 #endif