Merge branch 'master' into master-merge

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

diff --git a/radiant/texwindow.h b/radiant/texwindow.h
index d354c9dfd00f4dbfc26c67fd240b2fba813e5fb9..f17a980d73b224aadece0e9e313ad13911456f2f 100644 (file)
--- a/radiant/texwindow.h
+++ b/radiant/texwindow.h
@@ -56,6 +56,13 @@ void TextureBrowser_addShadersRealiseCallback( const SignalHandler& handler );
 
 void TextureBrowser_RefreshShaders();
 
-ui::Widget TextureBrowser_getGLWidget();
+#ifdef WORKAROUND_WINDOWS_GTK2_GLWIDGET
+ui::GLArea TextureBrowser_getGLWidget();
+#endif // WORKAROUND_WINDOWS_GTK2_GLWIDGET
+
+#ifdef WORKAROUND_MACOS_GTK2_GLWIDGET
+void TextureBrowser_showGLWidget();
+void TextureBrowser_hideGLWidget();
+#endif // WORKAROUND_MACOS_GTK2_GLWIDGET
 
 #endif