Merge remote-tracking branch 'illwieckz/pakpath'

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

diff --git a/include/itoolbar.h b/include/itoolbar.h
index 221938f6b8ba2ce175b5f3522ee3477859bdc84b..62d82b6ec889e83f5b1641bd92b821067525dc22 100644 (file)
--- a/include/itoolbar.h
+++ b/include/itoolbar.h
@@ -1,61 +1,66 @@
 /*
-Copyright (C) 1999-2007 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
+ */
 
-#ifndef __IPLUGTOOLBAR_H_
-#define __IPLUGTOOLBAR_H_
+#if !defined( INCLUDED_IPLUGTOOLBAR_H )
+#define INCLUDED_IPLUGTOOLBAR_H
 
-/*
-NOTE: this API requires Gtk
-it's a good practice to avoid putting #include <gtk/gtk.h> here
-in some cases, the compiler will get confused because of 'list' identifiers between Gtk and STL headers
-*/
-
-#define TOOLBAR_MAJOR "toolbar"
+#include <cstddef>
+#include "generic/constant.h"
 
 class IToolbarButton
 {
 public:
-  enum EType
-  {
-    eSpace,
-    eButton,
-    eToggleButton,
-    eRadioButton,
-  };
-
-  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;
+enum EType
+{
+       eSpace,
+       eButton,
+       eToggleButton,
+       eRadioButton,
+};
+
+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 unsigned int  (* PFN_TOOLBARBUTTONCOUNT)();
-typedef const IToolbarButton* (* PFN_GETTOOLBARBUTTON)(unsigned int index);
+typedef std::size_t ( *PFN_TOOLBARBUTTONCOUNT )();
+typedef const IToolbarButton* ( *PFN_GETTOOLBARBUTTON )( std::size_t index );
 
 struct _QERPlugToolbarTable
 {
-  int m_nSize;
-  PFN_TOOLBARBUTTONCOUNT m_pfnToolbarButtonCount;
-  PFN_GETTOOLBARBUTTON   m_pfnGetToolbarButton;
+       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