new version of glib is touchy

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

diff --git a/radiant/surfacedialog.h b/radiant/surfacedialog.h
index 6d5d48a14056b059e97b13bc7d4530700329f533..159b73ff55724bac420a12f1e4658c1b0ee9ff57 100644 (file)
--- a/radiant/surfacedialog.h
+++ b/radiant/surfacedialog.h
@@ -1,69 +1,69 @@
-/*\r
-Copyright (C) 1999-2007 id Software, Inc. and contributors.\r
-For a list of contributors, see the accompanying CONTRIBUTORS file.\r
-\r
-This file is part of GtkRadiant.\r
-\r
-GtkRadiant is free software; you can redistribute it and/or modify\r
-it under the terms of the GNU General Public License as published by\r
-the Free Software Foundation; either version 2 of the License, or\r
-(at your option) any later version.\r
-\r
-GtkRadiant is distributed in the hope that it will be useful,\r
-but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-GNU General Public License for more details.\r
-\r
-You should have received a copy of the GNU General Public License\r
-along with GtkRadiant; if not, write to the Free Software\r
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\r
-*/\r
-\r
-#ifndef _SURFACEDIALOG_H_\r
-#define _SURFACEDIALOG_H_\r
-\r
-#include "dialog.h"\r
-\r
-#ifdef _DEBUG\r
-//#define DBG_SI 1\r
-#endif\r
-\r
-class SurfaceDlg : public Dialog\r
-{\r
-  bool m_bPatchMode;\r
-  // brush primitive fake shift scale rot coords\r
-  float        m_shift[2];\r
-  float        m_rotate;\r
-  float        m_scale[2];\r
-    \r
-public:\r
-  SurfaceDlg ();\r
-\r
-  virtual void ShowDlg();\r
-  virtual void HideDlg();\r
-  void SetTexMods();\r
-  void GetTexMods();\r
-\r
-  void InitDefaultIncrement(texdef_t *);\r
-\r
-  // Dialog Data\r
-  int m_nHeight;\r
-  int m_nWidth;\r
-\r
-  // 0 is invalid, otherwise it's the Id of the last 'do' we are responsible for\r
-  int m_nUndoId;\r
-\r
-  // is the user editing the texture widget (that changes the behaviour of 'Enter' key from OnDone to OnApply\r
-  // reset to false at each SetTexMods or when dealing with Enter key\r
-  bool m_bEditingTextureWidget;\r
-\r
-protected:\r
-  void BuildDialog ();\r
-\r
-public:\r
-  // called to perform a fitting from the outside (shortcut key)\r
-  void FitAll();\r
-  GtkWidget *GetWidget (); // { return m_pWidget; }\r
-};\r
-\r
-#endif // _SURFACEDIALOG_H_\r
+/*
+   Copyright (C) 1999-2007 id Software, Inc. and contributors.
+   For a list of contributors, see the accompanying CONTRIBUTORS file.
+
+   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 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
+ */
+
+#ifndef _SURFACEDIALOG_H_
+#define _SURFACEDIALOG_H_
+
+#include "dialog.h"
+
+#ifdef _DEBUG
+//#define DBG_SI 1
+#endif
+
+class SurfaceDlg : public Dialog
+{
+bool m_bPatchMode;
+// brush primitive fake shift scale rot coords
+float m_shift[2];
+float m_rotate;
+float m_scale[2];
+
+public:
+SurfaceDlg ();
+
+virtual void ShowDlg();
+virtual void HideDlg();
+void SetTexMods();
+void GetTexMods();
+
+void InitDefaultIncrement( texdef_t * );
+
+// Dialog Data
+int m_nHeight;
+int m_nWidth;
+
+// 0 is invalid, otherwise it's the Id of the last 'do' we are responsible for
+int m_nUndoId;
+
+// is the user editing the texture widget (that changes the behaviour of 'Enter' key from OnDone to OnApply
+// reset to false at each SetTexMods or when dealing with Enter key
+bool m_bEditingTextureWidget;
+
+protected:
+void BuildDialog();
+
+public:
+// called to perform a fitting from the outside (shortcut key)
+void FitAll();
+GtkWidget *GetWidget();    // { return m_pWidget; }
+};
+
+#endif // _SURFACEDIALOG_H_