X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=radiant%2Ftexwindow.h;h=5c5e5d8fa16721395d3f7ed8803608d56439103e;hb=6a7dedc09f1a4b72077e0012bf0499a0005973d6;hp=c5dbf33cf6eac01b076208ab15328da99bdaa2f0;hpb=c11d5da7a3e41ae5e2d3f34a4c4f5ef06ed54363;p=xonotic%2Fnetradiant.git

diff --git a/radiant/texwindow.h b/radiant/texwindow.h
index c5dbf33c..5c5e5d8f 100644
--- a/radiant/texwindow.h
+++ b/radiant/texwindow.h
@@ -1,62 +1,68 @@
 /*
-Copyright (C) 1999-2006 Id Software, Inc. and contributors.
-For a list of contributors, see the accompanying CONTRIBUTORS file.
+   Copyright (C) 1999-2006 Id Software, Inc. and contributors.
+   For a list of contributors, see the accompanying CONTRIBUTORS file.
 
-This file is part of GtkRadiant.
+   This file is part of GtkRadiant.
 
-GtkRadiant is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   GtkRadiant is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-GtkRadiant is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   GtkRadiant is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU General Public License
+   along with GtkRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
-#if !defined(INCLUDED_TEXWINDOW_H)
+#if !defined( INCLUDED_TEXWINDOW_H )
 #define INCLUDED_TEXWINDOW_H
 
+#include <uilib/uilib.h>
+#include "property.h"
 #include "math/vector.h"
-#include "generic/callbackfwd.h"
+#include "generic/callback.h"
 #include "signal/signalfwd.h"
 #include "xml/xmltextags.h"
 
-typedef struct _GtkWidget GtkWidget;
-
 class TextureBrowser;
-TextureBrowser& GlobalTextureBrowser();
 
-typedef struct _GtkWindow GtkWindow;
-GtkWidget* TextureBrowser_constructWindow(GtkWindow* toplevel);
+TextureBrowser &GlobalTextureBrowser();
+
+ui::Widget TextureBrowser_constructWindow(ui::Window toplevel);
+
 void TextureBrowser_destroyWindow();
 
 
-void TextureBrowser_ShowDirectory(TextureBrowser& textureBrowser, const char* name);
-void TextureBrowser_ShowStartupShaders(TextureBrowser& textureBrowser);
+void TextureBrowser_ShowDirectory(TextureBrowser &textureBrowser, const char *name);
 
-const char* TextureBrowser_GetSelectedShader(TextureBrowser& textureBrower);
+void TextureBrowser_ShowStartupShaders(TextureBrowser &textureBrowser);
+
+const char *TextureBrowser_GetSelectedShader(TextureBrowser &textureBrower);
 
 void TextureBrowser_Construct();
+
 void TextureBrowser_Destroy();
 
-typedef Callback1<const char*> StringImportCallback;
-template<typename FirstArgument, void (*func)(FirstArgument)> 
-class FreeCaller1;
+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;
+
+const Vector3 &TextureBrowser_getBackgroundColour(TextureBrowser &textureBrowser);
+
+void TextureBrowser_setBackgroundColour(TextureBrowser &textureBrowser, const Vector3 &colour);
 
-extern GtkWidget* g_page_textures;
-void TextureBrowser_exportTitle(const StringImportCallback& importer);
-typedef FreeCaller1<const StringImportCallback&, TextureBrowser_exportTitle> TextureBrowserExportTitleCaller;
+void TextureBrowser_addActiveShadersChangedCallback(const SignalHandler &handler);
 
-const Vector3& TextureBrowser_getBackgroundColour(TextureBrowser& textureBrowser);
-void TextureBrowser_setBackgroundColour(TextureBrowser& textureBrowser, const Vector3& colour);
+void TextureBrowser_addShadersRealiseCallback(const SignalHandler &handler);
 
-void TextureBrowser_addActiveShadersChangedCallback(const SignalHandler& handler);
-void TextureBrowser_addShadersRealiseCallback(const SignalHandler& handler);
+void TextureBrowser_RefreshShaders();
 
 #endif