h2data: use static for homonyms

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

diff --git a/radiant/texwindow.h b/radiant/texwindow.h
index 2debcceaa8d2486f20719e49c0947fd799e416b9..80aa5e4d0bb9a5aa41e558112e046b92ad04c815 100644 (file)
--- a/radiant/texwindow.h
+++ b/radiant/texwindow.h
@@ -23,6 +23,7 @@
 #define INCLUDED_TEXWINDOW_H
 
 #include <uilib/uilib.h>
+#include "property.h"
 #include "math/vector.h"
 #include "generic/callback.h"
 #include "signal/signalfwd.h"
@@ -43,11 +44,9 @@ const char* TextureBrowser_GetSelectedShader( TextureBrowser& textureBrower );
 void TextureBrowser_Construct();
 void TextureBrowser_Destroy();
 
-typedef Callback<void(const char*)> StringImportCallback;
-
 extern ui::Widget g_page_textures;
-void TextureBrowser_exportTitle( const StringImportCallback& importer );
-typedef FreeCaller<void(const StringImportCallback&), TextureBrowser_exportTitle> TextureBrowserExportTitleCaller;
+void TextureBrowser_exportTitle( const Callback<void(const char *)> & importer );
+typedef FreeCaller<void(const Callback<void(const char *)> &), TextureBrowser_exportTitle> TextureBrowserExportTitleCaller;
 
 const Vector3& TextureBrowser_getBackgroundColour( TextureBrowser& textureBrowser );
 void TextureBrowser_setBackgroundColour( TextureBrowser& textureBrowser, const Vector3& colour );
@@ -57,4 +56,8 @@ void TextureBrowser_addShadersRealiseCallback( const SignalHandler& handler );
 
 void TextureBrowser_RefreshShaders();
 
+#ifdef WORKAROUND_WINDOWS_GTK2_GLWIDGET
+ui::GLArea TextureBrowser_getGLWidget();
+#endif // WORKAROUND_WINDOWS_GTK2_GLWIDGET
+
 #endif