Merge branch 'fix-fast' into 'master'

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

diff --git a/radiant/surfacedialog.h b/radiant/surfacedialog.h
index 034cf1d6b90de9a2b51ca343ca1d99a6e2b86890..739a1bf534e05f5f6f38d2fe3022c75cc8784949 100644 (file)
--- a/radiant/surfacedialog.h
+++ b/radiant/surfacedialog.h
@@ -1,60 +1,65 @@
 /*
-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_SURFACEDIALOG_H)
+#include <uilib/uilib.h>
+
+#if !defined( INCLUDED_SURFACEDIALOG_H )
 #define INCLUDED_SURFACEDIALOG_H
 
 
 void SurfaceInspector_Construct();
+
 void SurfaceInspector_Destroy();
 
-typedef struct _GtkWidget GtkWidget;
-typedef struct _GtkWindow GtkWindow;
-void SurfaceInspector_constructWindow(GtkWindow* widget);
+void SurfaceInspector_constructWindow(ui::Window widget);
+
 void SurfaceInspector_destroyWindow();
 
 bool SelectedFaces_empty();
+
 void SelectedFaces_copyTexture();
+
 void SelectedFaces_pasteTexture();
+
 void FaceTextureClipboard_setDefault();
 
 
 // the increment we are using for the surface inspector (this is saved in the prefs)
-struct si_globals_t
-{
-  float shift[2];
-  float scale[2];
-  float rotate;
-
-  bool m_bSnapTToGrid;
-
-  si_globals_t() : m_bSnapTToGrid(false)
-  {
-    shift[0] = 8.0f;
-    shift[1] = 8.0f;
-    scale[0] = 0.5f;
-    scale[1] = 0.5f;
-    rotate = 45.0f;
-  }
+struct si_globals_t {
+    float shift[2];
+    float scale[2];
+    float rotate;
+
+    bool m_bSnapTToGrid;
+
+    si_globals_t() : m_bSnapTToGrid(false)
+    {
+        shift[0] = 8.0f;
+        shift[1] = 8.0f;
+        scale[0] = 0.5f;
+        scale[1] = 0.5f;
+        rotate = 45.0f;
+    }
 };
+
 extern si_globals_t g_si_globals;
 
 #endif