summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-05-31 12:18:57 +0300
committerAndrei Karas <akaras@inbox.ru>2011-05-31 12:18:57 +0300
commitbe48ce2e0cf06cabdf6536f1a5357b30d2ed37ed (patch)
tree602ec672399715b23a08f3f13de79c0990f37e9e
parentf3eaa0b0e84013dd3a11003fe891f77ec366544b (diff)
downloadmanaplus-be48ce2e0cf06cabdf6536f1a5357b30d2ed37ed.tar.gz
manaplus-be48ce2e0cf06cabdf6536f1a5357b30d2ed37ed.tar.bz2
manaplus-be48ce2e0cf06cabdf6536f1a5357b30d2ed37ed.tar.xz
manaplus-be48ce2e0cf06cabdf6536f1a5357b30d2ed37ed.zip
Add missing guichan files.
-rwxr-xr-xconfigure.ac1
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am3
-rw-r--r--src/guichan/include/guichan/deathlistener.hpp90
-rw-r--r--src/guichan/include/guichan/selectionlistener.hpp95
5 files changed, 189 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 88952d80f..8141dabdb 100755
--- a/configure.ac
+++ b/configure.ac
@@ -136,7 +136,6 @@ if test "x$with_internalguichan" == "xno"; then
AC_CHECK_LIB([guichan_sdl], [gcnSDL], ,
AC_MSG_ERROR([ *** Unable to find Guichan SDL library (http://guichan.sf.net/)]))
-# CPPFLAGS="-I/usr/include -I. -I.. $CPPFLAGS"
else
with_internalguichan=yes
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4501f4cca..ac4260391 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -579,6 +579,7 @@ SET(SRCS_GUICHAN
guichan/include/guichan/basiccontainer.hpp
guichan/include/guichan/cliprectangle.hpp
guichan/include/guichan/color.hpp
+ guichan/include/guichan/deathlistener.hpp
guichan/include/guichan/defaultfont.hpp
guichan/include/guichan/event.hpp
guichan/include/guichan/exception.hpp
@@ -602,6 +603,7 @@ SET(SRCS_GUICHAN
guichan/include/guichan/platform.hpp
guichan/include/guichan/rectangle.hpp
guichan/include/guichan/selectionevent.hpp
+ guichan/include/guichan/selectionlistener.hpp
guichan/include/guichan/sdl/sdlgraphics.hpp
guichan/include/guichan/sdl/sdlimage.hpp
guichan/include/guichan/sdl/sdlpixel.hpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 63a5141ab..c13f645bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,4 @@
AUTOMAKE_OPTIONS = subdir-objects
-#AUTOMAKE_OPTIONS = subdir-objects nostdinc
bin_PROGRAMS = manaplus
@@ -29,6 +28,7 @@ manaplus_SOURCES += guichan/include/guichan/actionevent.hpp \
guichan/include/guichan/basiccontainer.hpp \
guichan/include/guichan/cliprectangle.hpp \
guichan/include/guichan/color.hpp \
+ guichan/include/guichan/deathlistener.hpp \
guichan/include/guichan/defaultfont.hpp \
guichan/include/guichan/event.hpp \
guichan/include/guichan/exception.hpp \
@@ -52,6 +52,7 @@ manaplus_SOURCES += guichan/include/guichan/actionevent.hpp \
guichan/include/guichan/platform.hpp \
guichan/include/guichan/rectangle.hpp \
guichan/include/guichan/selectionevent.hpp \
+ guichan/include/guichan/selectionlistener.hpp \
guichan/include/guichan/sdl/sdlgraphics.hpp \
guichan/include/guichan/sdl/sdlimage.hpp \
guichan/include/guichan/sdl/sdlpixel.hpp \
diff --git a/src/guichan/include/guichan/deathlistener.hpp b/src/guichan/include/guichan/deathlistener.hpp
new file mode 100644
index 000000000..a8e14a7f8
--- /dev/null
+++ b/src/guichan/include/guichan/deathlistener.hpp
@@ -0,0 +1,90 @@
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * 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_DEATHLISTENER_HPP
+#define GCN_DEATHLISTENER_HPP
+
+#include <string>
+
+#include "guichan/event.hpp"
+#include "guichan/platform.hpp"
+
+namespace gcn
+{
+ /**
+ * Interface for listening for death events from widgets.
+ *
+ * @see Widget::addDeathListener, Widget::removeDeathListener
+ * @author Olof Naessén
+ * @since 0.6.0
+ */
+ class GCN_CORE_DECLSPEC DeathListener
+ {
+ public:
+
+ /**
+ * Destructor.
+ */
+ virtual ~DeathListener() { }
+
+ /**
+ * Called when a widget dies. It is used to be able to recieve
+ * a notification when a death of a widget occurs.
+ *
+ * @param event The event of the death.
+ */
+ virtual void death(const Event& event) = 0;
+
+ protected:
+ /**
+ * Constructor.
+ *
+ * You should not be able to make an instance of DeathListener,
+ * therefore its constructor is protected.
+ */
+ DeathListener() { }
+
+ };
+}
+
+#endif // end GCN_DEATHLISTENER_HPP
diff --git a/src/guichan/include/guichan/selectionlistener.hpp b/src/guichan/include/guichan/selectionlistener.hpp
new file mode 100644
index 000000000..6c510f0d9
--- /dev/null
+++ b/src/guichan/include/guichan/selectionlistener.hpp
@@ -0,0 +1,95 @@
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * 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_SELECTIONLISTENER_HPP
+#define GCN_SELECTIONLISTENER_HPP
+
+#include <string>
+
+#include "guichan/selectionevent.hpp"
+#include "guichan/platform.hpp"
+
+namespace gcn
+{
+ /**
+ * Interface for listening for selection events from widgets.
+ *
+ * @see ListBox::addSelectionListener,
+ * ListBox::removeSelectionListener,
+ * DropDown::addSelectionListener,
+ * DropDown::removeSelectionListener
+ * @author Olof Naessén
+ * @since 0.8.0
+ */
+ class GCN_CORE_DECLSPEC SelectionListener
+ {
+ public:
+
+ /**
+ * Destructor.
+ */
+ virtual ~SelectionListener() { }
+
+ /**
+ * Called when the value of a selection has been changed in a Widget.
+ * It is used to be able to recieve a notification that a value has
+ * been changed.
+ *
+ * @param event The event of the value change.
+ * @since 0.8.0
+ */
+ virtual void valueChanged(const SelectionEvent& event) { };
+
+ protected:
+ /**
+ * Constructor.
+ *
+ * You should not be able to make an instance of SelectionListener,
+ * therefore its constructor is protected.
+ */
+ SelectionListener() { }
+
+ };
+}
+
+#endif // end GCN_SELECTIONLISTENER_HPP