From 9d885eab232de0acdf95405a996ed749fdbeea54 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 27 Jan 2014 18:57:02 +0300 Subject: remove platform.hpp from guichan sources. --- src/CMakeLists.txt | 1 - src/Makefile.am | 1 - src/guichan/include/guichan/actionevent.hpp | 3 +- src/guichan/include/guichan/actionlistener.hpp | 3 +- src/guichan/include/guichan/basiccontainer.hpp | 5 +- src/guichan/include/guichan/cliprectangle.hpp | 3 +- src/guichan/include/guichan/color.hpp | 4 +- src/guichan/include/guichan/deathlistener.hpp | 3 +- src/guichan/include/guichan/event.hpp | 4 +- src/guichan/include/guichan/exception.hpp | 4 +- src/guichan/include/guichan/focushandler.hpp | 3 +- src/guichan/include/guichan/focuslistener.hpp | 3 +- src/guichan/include/guichan/font.hpp | 3 +- src/guichan/include/guichan/graphics.hpp | 3 +- src/guichan/include/guichan/gui.hpp | 3 +- src/guichan/include/guichan/image.hpp | 4 +- src/guichan/include/guichan/input.hpp | 4 +- src/guichan/include/guichan/inputevent.hpp | 3 +- src/guichan/include/guichan/key.hpp | 4 +- src/guichan/include/guichan/keyevent.hpp | 3 +- src/guichan/include/guichan/keyinput.hpp | 3 +- src/guichan/include/guichan/keylistener.hpp | 3 +- src/guichan/include/guichan/listmodel.hpp | 4 +- src/guichan/include/guichan/mouseevent.hpp | 3 +- src/guichan/include/guichan/mouseinput.hpp | 4 +- src/guichan/include/guichan/mouselistener.hpp | 3 +- src/guichan/include/guichan/platform.hpp | 76 ---------------------- src/guichan/include/guichan/rectangle.hpp | 4 +- src/guichan/include/guichan/selectionevent.hpp | 3 +- src/guichan/include/guichan/selectionlistener.hpp | 3 +- src/guichan/include/guichan/widget.hpp | 2 +- src/guichan/include/guichan/widgetlistener.hpp | 3 +- src/guichan/include/guichan/widgets/button.hpp | 9 ++- src/guichan/include/guichan/widgets/checkbox.hpp | 3 +- src/guichan/include/guichan/widgets/container.hpp | 3 +- src/guichan/include/guichan/widgets/label.hpp | 3 +- src/guichan/include/guichan/widgets/listbox.hpp | 3 +- .../include/guichan/widgets/radiobutton.hpp | 3 +- src/guichan/include/guichan/widgets/scrollarea.hpp | 3 +- src/guichan/include/guichan/widgets/slider.hpp | 3 +- src/guichan/include/guichan/widgets/textbox.hpp | 3 +- src/guichan/include/guichan/widgets/textfield.hpp | 3 +- src/guichan/include/guichan/widgets/window.hpp | 5 +- 43 files changed, 45 insertions(+), 171 deletions(-) delete mode 100644 src/guichan/include/guichan/platform.hpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 67943d365..f6550de05 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -796,7 +796,6 @@ SET(SRCS_GUICHAN guichan/include/guichan/mouseevent.hpp guichan/include/guichan/mouseinput.hpp guichan/include/guichan/mouselistener.hpp - guichan/include/guichan/platform.hpp guichan/include/guichan/rectangle.hpp guichan/include/guichan/selectionevent.hpp guichan/include/guichan/selectionlistener.hpp diff --git a/src/Makefile.am b/src/Makefile.am index 7d6abb875..ba0fbc800 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -189,7 +189,6 @@ manaplus_SOURCES += guichan/include/guichan/actionevent.hpp \ guichan/include/guichan/mouseevent.hpp \ guichan/include/guichan/mouseinput.hpp \ guichan/include/guichan/mouselistener.hpp \ - guichan/include/guichan/platform.hpp \ guichan/include/guichan/rectangle.hpp \ guichan/include/guichan/selectionevent.hpp \ guichan/include/guichan/selectionlistener.hpp \ diff --git a/src/guichan/include/guichan/actionevent.hpp b/src/guichan/include/guichan/actionevent.hpp index 02ef089b6..a6539478e 100644 --- a/src/guichan/include/guichan/actionevent.hpp +++ b/src/guichan/include/guichan/actionevent.hpp @@ -46,7 +46,6 @@ #define GCN_ACTIONEVENT_HPP #include "guichan/event.hpp" -#include "guichan/platform.hpp" #include @@ -78,7 +77,7 @@ namespace gcn * @author Olof Naessén * @since 0.6.0 */ - class GCN_CORE_DECLSPEC ActionEvent final : public Event + class ActionEvent final : public Event { public: /** diff --git a/src/guichan/include/guichan/actionlistener.hpp b/src/guichan/include/guichan/actionlistener.hpp index 7d8ff33a8..6476f822f 100644 --- a/src/guichan/include/guichan/actionlistener.hpp +++ b/src/guichan/include/guichan/actionlistener.hpp @@ -48,7 +48,6 @@ #include #include "guichan/actionevent.hpp" -#include "guichan/platform.hpp" namespace gcn { @@ -60,7 +59,7 @@ namespace gcn * @author Olof Naessén * @author Per Larsson */ - class GCN_CORE_DECLSPEC ActionListener + class ActionListener { public: /** diff --git a/src/guichan/include/guichan/basiccontainer.hpp b/src/guichan/include/guichan/basiccontainer.hpp index a17b7314c..f329a77e4 100644 --- a/src/guichan/include/guichan/basiccontainer.hpp +++ b/src/guichan/include/guichan/basiccontainer.hpp @@ -49,7 +49,6 @@ #include #include "guichan/deathlistener.hpp" -#include "guichan/platform.hpp" #include "guichan/widget.hpp" namespace gcn @@ -62,8 +61,8 @@ namespace gcn * @see Container * @since 0.6.0 */ - class GCN_CORE_DECLSPEC BasicContainer : public Widget, - public DeathListener + class BasicContainer : public Widget, + public DeathListener { public: BasicContainer() : diff --git a/src/guichan/include/guichan/cliprectangle.hpp b/src/guichan/include/guichan/cliprectangle.hpp index bda344897..a9cbccebd 100644 --- a/src/guichan/include/guichan/cliprectangle.hpp +++ b/src/guichan/include/guichan/cliprectangle.hpp @@ -46,7 +46,6 @@ #define GCN_CLIPRECTANGLE_HPP #include "guichan/rectangle.hpp" -#include "guichan/platform.hpp" #include "localconsts.h" @@ -58,7 +57,7 @@ namespace gcn * offsets. The offsets are used for calculations from relative * screen coordinates to actual screen coordinates. */ - class GCN_CORE_DECLSPEC ClipRectangle final : public Rectangle + class ClipRectangle final : public Rectangle { public: /** diff --git a/src/guichan/include/guichan/color.hpp b/src/guichan/include/guichan/color.hpp index 56d72a387..f2b971bf3 100644 --- a/src/guichan/include/guichan/color.hpp +++ b/src/guichan/include/guichan/color.hpp @@ -45,8 +45,6 @@ #ifndef GCN_COLOR_HPP #define GCN_COLOR_HPP -#include "guichan/platform.hpp" - #include #include "localconsts.h" @@ -56,7 +54,7 @@ namespace gcn /** * Represents a color with red, green, blue and alpha components. */ - class GCN_CORE_DECLSPEC Color final + class Color final { public: /** diff --git a/src/guichan/include/guichan/deathlistener.hpp b/src/guichan/include/guichan/deathlistener.hpp index 3e7884021..e6cf30154 100644 --- a/src/guichan/include/guichan/deathlistener.hpp +++ b/src/guichan/include/guichan/deathlistener.hpp @@ -48,7 +48,6 @@ #include #include "guichan/event.hpp" -#include "guichan/platform.hpp" namespace gcn { @@ -59,7 +58,7 @@ namespace gcn * @author Olof Naessén * @since 0.6.0 */ - class GCN_CORE_DECLSPEC DeathListener + class DeathListener { public: /** diff --git a/src/guichan/include/guichan/event.hpp b/src/guichan/include/guichan/event.hpp index fa3220d51..8a5eda83f 100644 --- a/src/guichan/include/guichan/event.hpp +++ b/src/guichan/include/guichan/event.hpp @@ -45,8 +45,6 @@ #ifndef GCN_EVENT_HPP #define GCN_EVENT_HPP -#include "guichan/platform.hpp" - #include "localconsts.h" namespace gcn @@ -60,7 +58,7 @@ namespace gcn * @author Olof Naessén * @since 0.6.0 */ - class GCN_CORE_DECLSPEC Event + class Event { public: /** diff --git a/src/guichan/include/guichan/exception.hpp b/src/guichan/include/guichan/exception.hpp index 63809196d..f74bfa58f 100644 --- a/src/guichan/include/guichan/exception.hpp +++ b/src/guichan/include/guichan/exception.hpp @@ -47,8 +47,6 @@ #include -#include "guichan/platform.hpp" - #include "localconsts.h" #ifndef __FUNCTION__ @@ -85,7 +83,7 @@ namespace gcn * throw GCN_EXCEPTION("my error message"); * @endcode */ - class GCN_CORE_DECLSPEC Exception final + class Exception final { public: /** diff --git a/src/guichan/include/guichan/focushandler.hpp b/src/guichan/include/guichan/focushandler.hpp index 2eba92d1c..dbe4ece3a 100644 --- a/src/guichan/include/guichan/focushandler.hpp +++ b/src/guichan/include/guichan/focushandler.hpp @@ -48,7 +48,6 @@ #include #include "guichan/event.hpp" -#include "guichan/platform.hpp" namespace gcn { @@ -68,7 +67,7 @@ namespace gcn * * @since 0.1.0 */ - class GCN_CORE_DECLSPEC FocusHandler + class FocusHandler { public: /** diff --git a/src/guichan/include/guichan/focuslistener.hpp b/src/guichan/include/guichan/focuslistener.hpp index 32d891800..e62aaf5db 100644 --- a/src/guichan/include/guichan/focuslistener.hpp +++ b/src/guichan/include/guichan/focuslistener.hpp @@ -48,7 +48,6 @@ #include #include "guichan/event.hpp" -#include "guichan/platform.hpp" #include "localconsts.h" @@ -61,7 +60,7 @@ namespace gcn * @author Olof Naessén * @since 0.7.0 */ - class GCN_CORE_DECLSPEC FocusListener + class FocusListener { public: /** diff --git a/src/guichan/include/guichan/font.hpp b/src/guichan/include/guichan/font.hpp index b4550e4fe..fab6348f5 100644 --- a/src/guichan/include/guichan/font.hpp +++ b/src/guichan/include/guichan/font.hpp @@ -46,7 +46,6 @@ #define GCN_FONT_HPP #include -#include "guichan/platform.hpp" #include "localconsts.h" @@ -59,7 +58,7 @@ namespace gcn * * @see ImageFont */ - class GCN_CORE_DECLSPEC Font + class Font { public: /** diff --git a/src/guichan/include/guichan/graphics.hpp b/src/guichan/include/guichan/graphics.hpp index 831e2601a..1d7630bca 100644 --- a/src/guichan/include/guichan/graphics.hpp +++ b/src/guichan/include/guichan/graphics.hpp @@ -49,7 +49,6 @@ #include #include "guichan/cliprectangle.hpp" -#include "guichan/platform.hpp" namespace gcn { @@ -92,7 +91,7 @@ namespace gcn * SDLGraphics, Image * @since 0.1.0 */ - class GCN_CORE_DECLSPEC Graphics + class Graphics { public: /** diff --git a/src/guichan/include/guichan/gui.hpp b/src/guichan/include/guichan/gui.hpp index 0aa843653..365050353 100644 --- a/src/guichan/include/guichan/gui.hpp +++ b/src/guichan/include/guichan/gui.hpp @@ -51,7 +51,6 @@ #include "guichan/keyevent.hpp" #include "guichan/mouseevent.hpp" #include "guichan/mouseinput.hpp" -#include "guichan/platform.hpp" namespace gcn { @@ -94,7 +93,7 @@ namespace gcn * * @see Graphics, Input, Image */ - class GCN_CORE_DECLSPEC Gui + class Gui { public: /** diff --git a/src/guichan/include/guichan/image.hpp b/src/guichan/include/guichan/image.hpp index ec2b37188..d736cefcc 100644 --- a/src/guichan/include/guichan/image.hpp +++ b/src/guichan/include/guichan/image.hpp @@ -47,8 +47,6 @@ #include -#include "guichan/platform.hpp" - #include "localconsts.h" namespace gcn @@ -69,7 +67,7 @@ namespace gcn * OpenGLAllegroImageLoader, OpenGLSDLImageLoader, SDLImageLoader * @since 0.1.0 */ - class GCN_CORE_DECLSPEC Image + class Image { public: /** diff --git a/src/guichan/include/guichan/input.hpp b/src/guichan/include/guichan/input.hpp index 538e78e3c..1a43e732d 100644 --- a/src/guichan/include/guichan/input.hpp +++ b/src/guichan/include/guichan/input.hpp @@ -45,8 +45,6 @@ #ifndef GCN_INPUT_HPP #define GCN_INPUT_HPP -#include "guichan/platform.hpp" - #include "localconsts.h" namespace gcn @@ -66,7 +64,7 @@ namespace gcn * @see AllegroInput, HGEInput, OpenLayerInput, * SDLInput */ - class GCN_CORE_DECLSPEC Input + class Input { public: /** diff --git a/src/guichan/include/guichan/inputevent.hpp b/src/guichan/include/guichan/inputevent.hpp index 732886de8..87dd3359a 100644 --- a/src/guichan/include/guichan/inputevent.hpp +++ b/src/guichan/include/guichan/inputevent.hpp @@ -46,7 +46,6 @@ #define GCN_INPUTEVENT_HPP #include "guichan/event.hpp" -#include "guichan/platform.hpp" namespace gcn { @@ -56,7 +55,7 @@ namespace gcn * @author Olof Naessén * @since 0.6.0 */ - class GCN_CORE_DECLSPEC InputEvent: public Event + class InputEvent: public Event { public: /** diff --git a/src/guichan/include/guichan/key.hpp b/src/guichan/include/guichan/key.hpp index 086969b65..52c4b5515 100644 --- a/src/guichan/include/guichan/key.hpp +++ b/src/guichan/include/guichan/key.hpp @@ -45,8 +45,6 @@ #ifndef GCN_KEY_HPP #define GCN_KEY_HPP -#include "guichan/platform.hpp" - #include "localconsts.h" // windows.h defines DELETE which breaks this file as we have a constant named @@ -61,7 +59,7 @@ namespace gcn /** * Represents a key or a character. */ - class GCN_CORE_DECLSPEC Key final + class Key final { public: /** diff --git a/src/guichan/include/guichan/keyevent.hpp b/src/guichan/include/guichan/keyevent.hpp index 4ccb1bf8e..159f971b9 100644 --- a/src/guichan/include/guichan/keyevent.hpp +++ b/src/guichan/include/guichan/keyevent.hpp @@ -47,7 +47,6 @@ #include "guichan/inputevent.hpp" #include "guichan/key.hpp" -#include "guichan/platform.hpp" namespace gcn { @@ -56,7 +55,7 @@ namespace gcn /** * Represents a key event. */ - class GCN_CORE_DECLSPEC KeyEvent: public InputEvent + class KeyEvent: public InputEvent { public: /** diff --git a/src/guichan/include/guichan/keyinput.hpp b/src/guichan/include/guichan/keyinput.hpp index f38bd4d58..5748fe98f 100644 --- a/src/guichan/include/guichan/keyinput.hpp +++ b/src/guichan/include/guichan/keyinput.hpp @@ -46,7 +46,6 @@ #define GCN_KEYINPUT_HPP #include "guichan/key.hpp" -#include "guichan/platform.hpp" namespace gcn { @@ -57,7 +56,7 @@ namespace gcn * * @since 0.1.0 */ - class GCN_CORE_DECLSPEC KeyInput + class KeyInput { public: /** diff --git a/src/guichan/include/guichan/keylistener.hpp b/src/guichan/include/guichan/keylistener.hpp index 68657dd0a..ce9dd54a8 100644 --- a/src/guichan/include/guichan/keylistener.hpp +++ b/src/guichan/include/guichan/keylistener.hpp @@ -46,7 +46,6 @@ #define GCN_KEYLISTENER_HPP #include "guichan/keyevent.hpp" -#include "guichan/platform.hpp" #include "localconsts.h" @@ -59,7 +58,7 @@ namespace gcn * * @see Widget::addKeyListener, Widget::removeKeyListener */ - class GCN_CORE_DECLSPEC KeyListener + class KeyListener { public: /** diff --git a/src/guichan/include/guichan/listmodel.hpp b/src/guichan/include/guichan/listmodel.hpp index 7e46dae4d..52a00ad49 100644 --- a/src/guichan/include/guichan/listmodel.hpp +++ b/src/guichan/include/guichan/listmodel.hpp @@ -47,8 +47,6 @@ #include -#include "guichan/platform.hpp" - #include "localconsts.h" namespace gcn @@ -60,7 +58,7 @@ namespace gcn * like ListBox, make a derived class from this class that * represents your list. */ - class GCN_CORE_DECLSPEC ListModel + class ListModel { public: /** diff --git a/src/guichan/include/guichan/mouseevent.hpp b/src/guichan/include/guichan/mouseevent.hpp index dd385106a..0419556f7 100644 --- a/src/guichan/include/guichan/mouseevent.hpp +++ b/src/guichan/include/guichan/mouseevent.hpp @@ -46,7 +46,6 @@ #define GCN_MOUSEEVENT_HPP #include "guichan/inputevent.hpp" -#include "guichan/platform.hpp" namespace gcn { @@ -59,7 +58,7 @@ namespace gcn * @author Olof Naessén * @since 0.6.0 */ - class GCN_CORE_DECLSPEC MouseEvent: public InputEvent + class MouseEvent: public InputEvent { public: /** diff --git a/src/guichan/include/guichan/mouseinput.hpp b/src/guichan/include/guichan/mouseinput.hpp index 5037f786a..f43dcdc2d 100644 --- a/src/guichan/include/guichan/mouseinput.hpp +++ b/src/guichan/include/guichan/mouseinput.hpp @@ -45,8 +45,6 @@ #ifndef GCN_MOUSEINPUT_HPP #define GCN_MOUSEINPUT_HPP -#include "guichan/platform.hpp" - #include "localconsts.h" namespace gcn @@ -61,7 +59,7 @@ namespace gcn * @author Per Larsson * @since 0.1.0 */ - class GCN_CORE_DECLSPEC MouseInput + class MouseInput { public: /** diff --git a/src/guichan/include/guichan/mouselistener.hpp b/src/guichan/include/guichan/mouselistener.hpp index 18bf5c062..99cd6bb95 100644 --- a/src/guichan/include/guichan/mouselistener.hpp +++ b/src/guichan/include/guichan/mouselistener.hpp @@ -46,7 +46,6 @@ #define GCN_MOUSELISTENER_HPP #include "guichan/mouseevent.hpp" -#include "guichan/platform.hpp" #include "localconsts.h" @@ -58,7 +57,7 @@ namespace gcn * @see Widget::addMouseListener, Widget::removeMouseListener * @since 0.1.0 */ - class GCN_CORE_DECLSPEC MouseListener + class MouseListener { public: /** diff --git a/src/guichan/include/guichan/platform.hpp b/src/guichan/include/guichan/platform.hpp deleted file mode 100644 index a1a730d53..000000000 --- a/src/guichan/include/guichan/platform.hpp +++ /dev/null @@ -1,76 +0,0 @@ -/* _______ __ __ __ ______ __ __ _______ __ __ - * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ - * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / - * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / - * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / - * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / - * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ - * - * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson - * Copyright (C) 2011-2014 The ManaPlus Developers - * - * - * Per Larsson a.k.a finalman - * Olof Naessén a.k.a jansem/yakslem - * - * Visit: http://guichan.sourceforge.net - * - * License: (BSD) - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name of Guichan nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef GCN_PLATFORM_HPP -#define GCN_PLATFORM_HPP - -#if defined (__MINGW32__) && defined(GUICHAN_BUILD) -#define GCN_CORE_DECLSPEC __declspec(dllexport) - -#elif defined (__MINGW32__) && defined(GUICHAN_EXTENSION_BUILD) -#define GCN_EXTENSION_DECLSPEC __declspec(dllexport) -#define GCN_CORE_DECLSPEC __declspec(dllimport) - -#elif defined (__MINGW32__) && defined(GUICHAN_DLL_IMPORT) -#define GCN_CORE_DECLSPEC __declspec(dllimport) -#define GCN_EXTENSION_DECLSPEC __declspec(dllimport) - -#elif defined(_MSC_VER) && defined(GUICHAN_BUILD) -#define GCN_CORE_DECLSPEC _declspec(dllexport) - -#elif defined(_MSC_VER) && defined(GUICHAN_EXTENSION_BUILD) -#define GCN_CORE_DECLSPEC _declspec(dllimport) -#define GCN_EXTENSION_DECLSPEC _declspec(dllexport) - -#endif - -#ifndef GCN_CORE_DECLSPEC -#define GCN_CORE_DECLSPEC -#endif - -#ifndef GCN_EXTENSION_DECLSPEC -#define GCN_EXTENSION_DECLSPEC -#endif - -#endif // end GCN_PLATFORM_HPP diff --git a/src/guichan/include/guichan/rectangle.hpp b/src/guichan/include/guichan/rectangle.hpp index de32fbb99..1115a6125 100644 --- a/src/guichan/include/guichan/rectangle.hpp +++ b/src/guichan/include/guichan/rectangle.hpp @@ -45,8 +45,6 @@ #ifndef GCN_RECTANGLE_HPP #define GCN_RECTANGLE_HPP -#include "guichan/platform.hpp" - #include #include "localconsts.h" @@ -58,7 +56,7 @@ namespace gcn * * @since 0.1.0 */ - class GCN_CORE_DECLSPEC Rectangle + class Rectangle { public: /** diff --git a/src/guichan/include/guichan/selectionevent.hpp b/src/guichan/include/guichan/selectionevent.hpp index 5880be79e..e2cad0528 100644 --- a/src/guichan/include/guichan/selectionevent.hpp +++ b/src/guichan/include/guichan/selectionevent.hpp @@ -46,7 +46,6 @@ #define GCN_SELECTIONEVENT_HPP #include "guichan/event.hpp" -#include "guichan/platform.hpp" #include "localconsts.h" @@ -60,7 +59,7 @@ namespace gcn * @author Olof Naessén * @since 0.8.0 */ - class GCN_CORE_DECLSPEC SelectionEvent final: public Event + class SelectionEvent final: public Event { public: /** diff --git a/src/guichan/include/guichan/selectionlistener.hpp b/src/guichan/include/guichan/selectionlistener.hpp index 298a11e3d..b7dad6166 100644 --- a/src/guichan/include/guichan/selectionlistener.hpp +++ b/src/guichan/include/guichan/selectionlistener.hpp @@ -48,7 +48,6 @@ #include #include "guichan/selectionevent.hpp" -#include "guichan/platform.hpp" #include "localconsts.h" @@ -64,7 +63,7 @@ namespace gcn * @author Olof Naessén * @since 0.8.0 */ - class GCN_CORE_DECLSPEC SelectionListener + class SelectionListener { public: /** diff --git a/src/guichan/include/guichan/widget.hpp b/src/guichan/include/guichan/widget.hpp index f4d316b25..32edabc32 100644 --- a/src/guichan/include/guichan/widget.hpp +++ b/src/guichan/include/guichan/widget.hpp @@ -80,7 +80,7 @@ namespace gcn * @author Per Larsson. * @since 0.1.0 */ - class GCN_CORE_DECLSPEC Widget + class Widget { public: /** diff --git a/src/guichan/include/guichan/widgetlistener.hpp b/src/guichan/include/guichan/widgetlistener.hpp index 65cb7fc1d..e8dee4fd0 100644 --- a/src/guichan/include/guichan/widgetlistener.hpp +++ b/src/guichan/include/guichan/widgetlistener.hpp @@ -48,7 +48,6 @@ #include #include "guichan/event.hpp" -#include "guichan/platform.hpp" #include "localconsts.h" @@ -63,7 +62,7 @@ namespace gcn * @author Olof Naessén * @since 0.8.0 */ - class GCN_CORE_DECLSPEC WidgetListener + class WidgetListener { public: /** diff --git a/src/guichan/include/guichan/widgets/button.hpp b/src/guichan/include/guichan/widgets/button.hpp index 225a3c23f..f3138e574 100644 --- a/src/guichan/include/guichan/widgets/button.hpp +++ b/src/guichan/include/guichan/widgets/button.hpp @@ -52,7 +52,6 @@ #include "guichan/keylistener.hpp" #include "guichan/mouseevent.hpp" #include "guichan/mouselistener.hpp" -#include "guichan/platform.hpp" #include "guichan/widget.hpp" namespace gcn @@ -66,10 +65,10 @@ namespace gcn * * @see ImageButton */ - class GCN_CORE_DECLSPEC Button : public Widget, - public MouseListener, - public KeyListener, - public FocusListener + class Button : public Widget, + public MouseListener, + public KeyListener, + public FocusListener { public: /** diff --git a/src/guichan/include/guichan/widgets/checkbox.hpp b/src/guichan/include/guichan/widgets/checkbox.hpp index f89ac355e..b35b6b40b 100644 --- a/src/guichan/include/guichan/widgets/checkbox.hpp +++ b/src/guichan/include/guichan/widgets/checkbox.hpp @@ -49,7 +49,6 @@ #include "guichan/keylistener.hpp" #include "guichan/mouselistener.hpp" -#include "guichan/platform.hpp" #include "guichan/widget.hpp" namespace gcn @@ -62,7 +61,7 @@ namespace gcn * If a check box's state changes an action event will be sent to all action * listeners of the check box. */ - class GCN_CORE_DECLSPEC CheckBox : + class CheckBox : public Widget, public MouseListener, public KeyListener diff --git a/src/guichan/include/guichan/widgets/container.hpp b/src/guichan/include/guichan/widgets/container.hpp index 21a612379..33fa77337 100644 --- a/src/guichan/include/guichan/widgets/container.hpp +++ b/src/guichan/include/guichan/widgets/container.hpp @@ -49,7 +49,6 @@ #include "guichan/basiccontainer.hpp" #include "guichan/graphics.hpp" -#include "guichan/platform.hpp" namespace gcn { @@ -61,7 +60,7 @@ namespace gcn * * @see Gui::setTop */ - class GCN_CORE_DECLSPEC Container: public BasicContainer + class Container: public BasicContainer { public: /** diff --git a/src/guichan/include/guichan/widgets/label.hpp b/src/guichan/include/guichan/widgets/label.hpp index 804842a07..62a27c630 100644 --- a/src/guichan/include/guichan/widgets/label.hpp +++ b/src/guichan/include/guichan/widgets/label.hpp @@ -48,7 +48,6 @@ #include #include "guichan/graphics.hpp" -#include "guichan/platform.hpp" #include "guichan/widget.hpp" namespace gcn @@ -56,7 +55,7 @@ namespace gcn /** * Implementation of a label capable of displaying a caption. */ - class GCN_CORE_DECLSPEC Label: public Widget + class Label: public Widget { public: /** diff --git a/src/guichan/include/guichan/widgets/listbox.hpp b/src/guichan/include/guichan/widgets/listbox.hpp index e19427a1e..452e0a01d 100644 --- a/src/guichan/include/guichan/widgets/listbox.hpp +++ b/src/guichan/include/guichan/widgets/listbox.hpp @@ -50,7 +50,6 @@ #include "guichan/keylistener.hpp" #include "guichan/listmodel.hpp" #include "guichan/mouselistener.hpp" -#include "guichan/platform.hpp" #include "guichan/widget.hpp" namespace gcn @@ -68,7 +67,7 @@ namespace gcn * a mouse click or by using the enter or space key an action event will be * sent to all action listeners of the list box. */ - class GCN_CORE_DECLSPEC ListBox : + class ListBox : public Widget, public MouseListener, public KeyListener diff --git a/src/guichan/include/guichan/widgets/radiobutton.hpp b/src/guichan/include/guichan/widgets/radiobutton.hpp index 32ec1fdbf..f40e43066 100644 --- a/src/guichan/include/guichan/widgets/radiobutton.hpp +++ b/src/guichan/include/guichan/widgets/radiobutton.hpp @@ -50,7 +50,6 @@ #include "guichan/keylistener.hpp" #include "guichan/mouselistener.hpp" -#include "guichan/platform.hpp" #include "guichan/widget.hpp" namespace gcn @@ -65,7 +64,7 @@ namespace gcn * If a radio button's state changes an action event will be sent to all action * listeners of the check box. */ - class GCN_CORE_DECLSPEC RadioButton : + class RadioButton : public Widget, public MouseListener, public KeyListener diff --git a/src/guichan/include/guichan/widgets/scrollarea.hpp b/src/guichan/include/guichan/widgets/scrollarea.hpp index c0d16456b..0d41f7977 100644 --- a/src/guichan/include/guichan/widgets/scrollarea.hpp +++ b/src/guichan/include/guichan/widgets/scrollarea.hpp @@ -49,7 +49,6 @@ #include "guichan/basiccontainer.hpp" #include "guichan/mouselistener.hpp" -#include "guichan/platform.hpp" namespace gcn { @@ -58,7 +57,7 @@ namespace gcn * A scroll area can be customized to always show scroll bars or to show them only when * necessary. */ - class GCN_CORE_DECLSPEC ScrollArea: + class ScrollArea: public BasicContainer, public MouseListener { diff --git a/src/guichan/include/guichan/widgets/slider.hpp b/src/guichan/include/guichan/widgets/slider.hpp index 28c3af0d0..461713a1e 100644 --- a/src/guichan/include/guichan/widgets/slider.hpp +++ b/src/guichan/include/guichan/widgets/slider.hpp @@ -47,7 +47,6 @@ #include "guichan/keylistener.hpp" #include "guichan/mouselistener.hpp" -#include "guichan/platform.hpp" #include "guichan/widget.hpp" namespace gcn @@ -59,7 +58,7 @@ namespace gcn * If the selected value is changed an action event will be sent to all * action listeners of the slider. */ - class GCN_CORE_DECLSPEC Slider : + class Slider : public Widget, public MouseListener, public KeyListener diff --git a/src/guichan/include/guichan/widgets/textbox.hpp b/src/guichan/include/guichan/widgets/textbox.hpp index 49b2a5d02..3a3205059 100644 --- a/src/guichan/include/guichan/widgets/textbox.hpp +++ b/src/guichan/include/guichan/widgets/textbox.hpp @@ -51,7 +51,6 @@ #include "guichan/keylistener.hpp" #include "guichan/mouselistener.hpp" -#include "guichan/platform.hpp" #include "guichan/widget.hpp" namespace gcn @@ -59,7 +58,7 @@ namespace gcn /** * An implementation of a text box where a user can enter text that contains of many lines. */ - class GCN_CORE_DECLSPEC TextBox: + class TextBox: public Widget, public MouseListener, public KeyListener diff --git a/src/guichan/include/guichan/widgets/textfield.hpp b/src/guichan/include/guichan/widgets/textfield.hpp index 7b7528c46..a0de3b547 100644 --- a/src/guichan/include/guichan/widgets/textfield.hpp +++ b/src/guichan/include/guichan/widgets/textfield.hpp @@ -47,7 +47,6 @@ #include "guichan/keylistener.hpp" #include "guichan/mouselistener.hpp" -#include "guichan/platform.hpp" #include "guichan/widget.hpp" #include @@ -57,7 +56,7 @@ namespace gcn /** * An implementation of a text field where a user can enter a line of text. */ - class GCN_CORE_DECLSPEC TextField: + class TextField: public Widget, public MouseListener, public KeyListener diff --git a/src/guichan/include/guichan/widgets/window.hpp b/src/guichan/include/guichan/widgets/window.hpp index 5fe1bfb21..a3ebad531 100644 --- a/src/guichan/include/guichan/widgets/window.hpp +++ b/src/guichan/include/guichan/widgets/window.hpp @@ -48,7 +48,6 @@ #include #include "guichan/mouselistener.hpp" -#include "guichan/platform.hpp" #include "guichan/widgets/container.hpp" namespace gcn @@ -56,8 +55,8 @@ namespace gcn /** * An implementation of a movable window that can contain other widgets. */ - class GCN_CORE_DECLSPEC Window : public Container, - public MouseListener + class Window : public Container, + public MouseListener { public: /** -- cgit v1.2.3-60-g2f50