Merge commit 'b243946c9ffd022cd5d82f2cf474ebfb125929b9' into master-merge

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

diff --git a/radiant/texwindow.h b/radiant/texwindow.h
index 5c5e5d8fa16721395d3f7ed8803608d56439103e..f17a980d73b224aadece0e9e313ad13911456f2f 100644 (file)
--- a/radiant/texwindow.h
+++ b/radiant/texwindow.h
@@ -30,39 +30,39 @@
 #include "xml/xmltextags.h"
 
 class TextureBrowser;
+TextureBrowser& GlobalTextureBrowser();
 
-TextureBrowser &GlobalTextureBrowser();
-
-ui::Widget TextureBrowser_constructWindow(ui::Window toplevel);
-
+ui::Widget TextureBrowser_constructWindow( ui::Window toplevel );
 void TextureBrowser_destroyWindow();
 
 
-void TextureBrowser_ShowDirectory(TextureBrowser &textureBrowser, const char *name);
+void TextureBrowser_ShowDirectory( TextureBrowser& textureBrowser, const char* name );
+void TextureBrowser_ShowStartupShaders( TextureBrowser& textureBrowser );
 
-void TextureBrowser_ShowStartupShaders(TextureBrowser &textureBrowser);
-
-const char *TextureBrowser_GetSelectedShader(TextureBrowser &textureBrower);
+const char* TextureBrowser_GetSelectedShader( TextureBrowser& textureBrower );
 
 void TextureBrowser_Construct();
-
 void TextureBrowser_Destroy();
 
 extern ui::Widget g_page_textures;
+void TextureBrowser_exportTitle( const Callback<void(const char *)> & importer );
+typedef FreeCaller<void(const Callback<void(const char *)> &), TextureBrowser_exportTitle> TextureBrowserExportTitleCaller;
 
-void TextureBrowser_exportTitle(const Callback<void(const char *)> &importer);
+const Vector3& TextureBrowser_getBackgroundColour( TextureBrowser& textureBrowser );
+void TextureBrowser_setBackgroundColour( TextureBrowser& textureBrowser, const Vector3& colour );
 
-typedef FreeCaller<void(
-        const Callback<void(const char *)> &), TextureBrowser_exportTitle> TextureBrowserExportTitleCaller;
+void TextureBrowser_addActiveShadersChangedCallback( const SignalHandler& handler );
+void TextureBrowser_addShadersRealiseCallback( const SignalHandler& handler );
 
-const Vector3 &TextureBrowser_getBackgroundColour(TextureBrowser &textureBrowser);
-
-void TextureBrowser_setBackgroundColour(TextureBrowser &textureBrowser, const Vector3 &colour);
-
-void TextureBrowser_addActiveShadersChangedCallback(const SignalHandler &handler);
+void TextureBrowser_RefreshShaders();
 
-void TextureBrowser_addShadersRealiseCallback(const SignalHandler &handler);
+#ifdef WORKAROUND_WINDOWS_GTK2_GLWIDGET
+ui::GLArea TextureBrowser_getGLWidget();
+#endif // WORKAROUND_WINDOWS_GTK2_GLWIDGET
 
-void TextureBrowser_RefreshShaders();
+#ifdef WORKAROUND_MACOS_GTK2_GLWIDGET
+void TextureBrowser_showGLWidget();
+void TextureBrowser_hideGLWidget();
+#endif // WORKAROUND_MACOS_GTK2_GLWIDGET
 
 #endif