Merge branch 'q3map2help' into 'master'

[xonotic/netradiant.git] / include / itoolbar.h

diff --git a/include/itoolbar.h b/include/itoolbar.h
index 05a05559357a604eca5b9788d5a433ddd06621de..7e5daad302a0eae0761d0c51f13a7797bff35819 100644 (file)
--- a/include/itoolbar.h
+++ b/include/itoolbar.h
@@ -1,61 +1,65 @@
-/*\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 __IPLUGTOOLBAR_H_\r
-#define __IPLUGTOOLBAR_H_\r
-\r
-/*\r
-NOTE: this API requires Gtk\r
-it's a good practice to avoid putting #include <gtk/gtk.h> here\r
-in some cases, the compiler will get confused because of 'list' identifiers between Gtk and STL headers\r
-*/\r
-\r
-#define TOOLBAR_MAJOR "toolbar"\r
-\r
-class IToolbarButton\r
-{\r
-public:\r
-  enum EType\r
-  {\r
-    eSpace,\r
-    eButton,\r
-    eToggleButton,\r
-    eRadioButton,\r
-  };\r
-\r
-  virtual const char* getImage() const = 0;\r
-  virtual const char* getText() const = 0;\r
-  virtual const char* getTooltip() const = 0;\r
-  virtual EType getType() const = 0;\r
-  virtual void activate() const = 0;\r
-};\r
-\r
-typedef unsigned int  (* PFN_TOOLBARBUTTONCOUNT)();\r
-typedef const IToolbarButton* (* PFN_GETTOOLBARBUTTON)(unsigned int index);\r
-\r
-struct _QERPlugToolbarTable\r
-{\r
-  int m_nSize;\r
-  PFN_TOOLBARBUTTONCOUNT m_pfnToolbarButtonCount;\r
-  PFN_GETTOOLBARBUTTON   m_pfnGetToolbarButton;\r
-};\r
-\r
-#endif\r
+/*
+   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.
+
+   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
+ */
+
+#if !defined( INCLUDED_IPLUGTOOLBAR_H )
+#define INCLUDED_IPLUGTOOLBAR_H
+
+#include <cstddef>
+#include "generic/constant.h"
+
+class IToolbarButton
+{
+public:
+enum EType
+{
+       eSpace,
+       eButton,
+       eToggleButton,
+};
+
+virtual const char* getImage() const = 0;
+virtual const char* getText() const = 0;
+virtual const char* getTooltip() const = 0;
+virtual EType getType() const = 0;
+virtual void activate() const = 0;
+};
+
+typedef std::size_t ( *PFN_TOOLBARBUTTONCOUNT )();
+typedef const IToolbarButton* ( *PFN_GETTOOLBARBUTTON )( std::size_t index );
+
+struct _QERPlugToolbarTable
+{
+       INTEGER_CONSTANT( Version, 1 );
+       STRING_CONSTANT( Name, "toolbar" );
+
+       PFN_TOOLBARBUTTONCOUNT m_pfnToolbarButtonCount;
+       PFN_GETTOOLBARBUTTON m_pfnGetToolbarButton;
+};
+
+template<typename Type>
+class Modules;
+typedef Modules<_QERPlugToolbarTable> ToolbarModules;
+
+template<typename Type>
+class ModulesRef;
+typedef ModulesRef<_QERPlugToolbarTable> ToolbarModulesRef;
+
+#endif