summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-05-31 03:54:18 +0300
committerAndrei Karas <akaras@inbox.ru>2011-05-31 04:12:55 +0300
commitd5af01cef60230bfdd90dda14944075f896e2a93 (patch)
tree27fc5eebad5cdb39d72da324edf9907a6547ee40 /src
parentbd17bd98bb85bc146958fed07f48dcea55a969a5 (diff)
downloadplus-d5af01cef60230bfdd90dda14944075f896e2a93.tar.gz
plus-d5af01cef60230bfdd90dda14944075f896e2a93.tar.bz2
plus-d5af01cef60230bfdd90dda14944075f896e2a93.tar.xz
plus-d5af01cef60230bfdd90dda14944075f896e2a93.zip
Allow use system guichan by automake switch --with-internalguichan=no.
Cmake always using internal guichan.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt99
-rw-r--r--src/Makefile.am102
-rw-r--r--src/guichan/include/guichan/actionevent.hpp (renamed from src/guichan/actionevent.hpp)0
-rw-r--r--src/guichan/include/guichan/actionlistener.hpp (renamed from src/guichan/actionlistener.hpp)0
-rw-r--r--src/guichan/include/guichan/basiccontainer.hpp (renamed from src/guichan/basiccontainer.hpp)0
-rw-r--r--src/guichan/include/guichan/cliprectangle.hpp (renamed from src/guichan/cliprectangle.hpp)0
-rw-r--r--src/guichan/include/guichan/color.hpp (renamed from src/guichan/color.hpp)0
-rw-r--r--src/guichan/include/guichan/defaultfont.hpp (renamed from src/guichan/defaultfont.hpp)0
-rw-r--r--src/guichan/include/guichan/event.hpp (renamed from src/guichan/event.hpp)0
-rw-r--r--src/guichan/include/guichan/exception.hpp (renamed from src/guichan/exception.hpp)0
-rw-r--r--src/guichan/include/guichan/focushandler.hpp (renamed from src/guichan/focushandler.hpp)0
-rw-r--r--src/guichan/include/guichan/focuslistener.hpp (renamed from src/guichan/focuslistener.hpp)0
-rw-r--r--src/guichan/include/guichan/font.hpp (renamed from src/guichan/font.hpp)0
-rw-r--r--src/guichan/include/guichan/graphics.hpp (renamed from src/guichan/graphics.hpp)0
-rw-r--r--src/guichan/include/guichan/gui.hpp (renamed from src/guichan/gui.hpp)0
-rw-r--r--src/guichan/include/guichan/image.hpp (renamed from src/guichan/image.hpp)0
-rw-r--r--src/guichan/include/guichan/imageloader.hpp (renamed from src/guichan/imageloader.hpp)0
-rw-r--r--src/guichan/include/guichan/input.hpp (renamed from src/guichan/input.hpp)0
-rw-r--r--src/guichan/include/guichan/inputevent.hpp (renamed from src/guichan/inputevent.hpp)0
-rw-r--r--src/guichan/include/guichan/key.hpp (renamed from src/guichan/key.hpp)0
-rw-r--r--src/guichan/include/guichan/keyevent.hpp (renamed from src/guichan/keyevent.hpp)0
-rw-r--r--src/guichan/include/guichan/keyinput.hpp (renamed from src/guichan/keyinput.hpp)0
-rw-r--r--src/guichan/include/guichan/keylistener.hpp (renamed from src/guichan/keylistener.hpp)0
-rw-r--r--src/guichan/include/guichan/listmodel.hpp (renamed from src/guichan/listmodel.hpp)0
-rw-r--r--src/guichan/include/guichan/mouseevent.hpp (renamed from src/guichan/mouseevent.hpp)0
-rw-r--r--src/guichan/include/guichan/mouseinput.hpp (renamed from src/guichan/mouseinput.hpp)0
-rw-r--r--src/guichan/include/guichan/mouselistener.hpp (renamed from src/guichan/mouselistener.hpp)0
-rw-r--r--src/guichan/include/guichan/platform.hpp (renamed from src/guichan/platform.hpp)0
-rw-r--r--src/guichan/include/guichan/rectangle.hpp (renamed from src/guichan/rectangle.hpp)0
-rw-r--r--src/guichan/include/guichan/sdl/sdlgraphics.hpp (renamed from src/guichan/sdl/sdlgraphics.hpp)0
-rw-r--r--src/guichan/include/guichan/sdl/sdlimage.hpp (renamed from src/guichan/sdl/sdlimage.hpp)0
-rw-r--r--src/guichan/include/guichan/sdl/sdlpixel.hpp (renamed from src/guichan/sdl/sdlpixel.hpp)0
-rw-r--r--src/guichan/include/guichan/selectionevent.hpp (renamed from src/guichan/selectionevent.hpp)0
-rw-r--r--src/guichan/include/guichan/widget.hpp (renamed from src/guichan/widget.hpp)0
-rw-r--r--src/guichan/include/guichan/widgetlistener.hpp (renamed from src/guichan/widgetlistener.hpp)0
-rw-r--r--src/guichan/include/guichan/widgets/button.hpp (renamed from src/guichan/widgets/button.hpp)0
-rw-r--r--src/guichan/include/guichan/widgets/checkbox.hpp (renamed from src/guichan/widgets/checkbox.hpp)0
-rw-r--r--src/guichan/include/guichan/widgets/container.hpp (renamed from src/guichan/widgets/container.hpp)0
-rw-r--r--src/guichan/include/guichan/widgets/dropdown.hpp (renamed from src/guichan/widgets/dropdown.hpp)0
-rw-r--r--src/guichan/include/guichan/widgets/icon.hpp (renamed from src/guichan/widgets/icon.hpp)0
-rw-r--r--src/guichan/include/guichan/widgets/imagebutton.hpp (renamed from src/guichan/widgets/imagebutton.hpp)0
-rw-r--r--src/guichan/include/guichan/widgets/label.hpp (renamed from src/guichan/widgets/label.hpp)0
-rw-r--r--src/guichan/include/guichan/widgets/listbox.hpp (renamed from src/guichan/widgets/listbox.hpp)0
-rw-r--r--src/guichan/include/guichan/widgets/radiobutton.hpp (renamed from src/guichan/widgets/radiobutton.hpp)0
-rw-r--r--src/guichan/include/guichan/widgets/scrollarea.hpp (renamed from src/guichan/widgets/scrollarea.hpp)0
-rw-r--r--src/guichan/include/guichan/widgets/slider.hpp (renamed from src/guichan/widgets/slider.hpp)0
-rw-r--r--src/guichan/include/guichan/widgets/tab.hpp (renamed from src/guichan/widgets/tab.hpp)0
-rw-r--r--src/guichan/include/guichan/widgets/tabbedarea.hpp (renamed from src/guichan/widgets/tabbedarea.hpp)0
-rw-r--r--src/guichan/include/guichan/widgets/textbox.hpp (renamed from src/guichan/widgets/textbox.hpp)0
-rw-r--r--src/guichan/include/guichan/widgets/textfield.hpp (renamed from src/guichan/widgets/textfield.hpp)0
-rw-r--r--src/guichan/include/guichan/widgets/window.hpp (renamed from src/guichan/widgets/window.hpp)0
51 files changed, 103 insertions, 98 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 29a0c610d..4501f4cca 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -68,6 +68,7 @@ IF (USE_X11)
ENDIF (USE_X11)
INCLUDE_DIRECTORIES(
+ "guichan/include"
${CMAKE_CURRENT_SOURCE_DIR}
${SDL_INCLUDE_DIR}
${SDLIMAGE_INCLUDE_DIR}
@@ -573,55 +574,55 @@ SET(SRCS
)
SET(SRCS_GUICHAN
- guichan/actionevent.hpp
- guichan/actionlistener.hpp
- guichan/basiccontainer.hpp
- guichan/cliprectangle.hpp
- guichan/color.hpp
- guichan/defaultfont.hpp
- guichan/event.hpp
- guichan/exception.hpp
- guichan/focushandler.hpp
- guichan/focuslistener.hpp
- guichan/font.hpp
- guichan/graphics.hpp
- guichan/gui.hpp
- guichan/image.hpp
- guichan/imageloader.hpp
- guichan/input.hpp
- guichan/inputevent.hpp
- guichan/key.hpp
- guichan/keyevent.hpp
- guichan/keyinput.hpp
- guichan/keylistener.hpp
- guichan/listmodel.hpp
- guichan/mouseevent.hpp
- guichan/mouseinput.hpp
- guichan/mouselistener.hpp
- guichan/platform.hpp
- guichan/rectangle.hpp
- guichan/selectionevent.hpp
- guichan/sdl/sdlgraphics.hpp
- guichan/sdl/sdlimage.hpp
- guichan/sdl/sdlpixel.hpp
- guichan/widget.hpp
- guichan/widgetlistener.hpp
- guichan/widgets/button.hpp
- guichan/widgets/checkbox.hpp
- guichan/widgets/container.hpp
- guichan/widgets/dropdown.hpp
- guichan/widgets/icon.hpp
- guichan/widgets/imagebutton.hpp
- guichan/widgets/label.hpp
- guichan/widgets/listbox.hpp
- guichan/widgets/radiobutton.hpp
- guichan/widgets/scrollarea.hpp
- guichan/widgets/slider.hpp
- guichan/widgets/tabbedarea.hpp
- guichan/widgets/tab.hpp
- guichan/widgets/textbox.hpp
- guichan/widgets/textfield.hpp
- guichan/widgets/window.hpp
+ guichan/include/guichan/actionevent.hpp
+ guichan/include/guichan/actionlistener.hpp
+ guichan/include/guichan/basiccontainer.hpp
+ guichan/include/guichan/cliprectangle.hpp
+ guichan/include/guichan/color.hpp
+ guichan/include/guichan/defaultfont.hpp
+ guichan/include/guichan/event.hpp
+ guichan/include/guichan/exception.hpp
+ guichan/include/guichan/focushandler.hpp
+ guichan/include/guichan/focuslistener.hpp
+ guichan/include/guichan/font.hpp
+ guichan/include/guichan/graphics.hpp
+ guichan/include/guichan/gui.hpp
+ guichan/include/guichan/image.hpp
+ guichan/include/guichan/imageloader.hpp
+ guichan/include/guichan/input.hpp
+ guichan/include/guichan/inputevent.hpp
+ guichan/include/guichan/key.hpp
+ guichan/include/guichan/keyevent.hpp
+ guichan/include/guichan/keyinput.hpp
+ guichan/include/guichan/keylistener.hpp
+ guichan/include/guichan/listmodel.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/sdl/sdlgraphics.hpp
+ guichan/include/guichan/sdl/sdlimage.hpp
+ guichan/include/guichan/sdl/sdlpixel.hpp
+ guichan/include/guichan/widget.hpp
+ guichan/include/guichan/widgetlistener.hpp
+ guichan/include/guichan/widgets/button.hpp
+ guichan/include/guichan/widgets/checkbox.hpp
+ guichan/include/guichan/widgets/container.hpp
+ guichan/include/guichan/widgets/dropdown.hpp
+ guichan/include/guichan/widgets/icon.hpp
+ guichan/include/guichan/widgets/imagebutton.hpp
+ guichan/include/guichan/widgets/label.hpp
+ guichan/include/guichan/widgets/listbox.hpp
+ guichan/include/guichan/widgets/radiobutton.hpp
+ guichan/include/guichan/widgets/scrollarea.hpp
+ guichan/include/guichan/widgets/slider.hpp
+ guichan/include/guichan/widgets/tabbedarea.hpp
+ guichan/include/guichan/widgets/tab.hpp
+ guichan/include/guichan/widgets/textbox.hpp
+ guichan/include/guichan/widgets/textfield.hpp
+ guichan/include/guichan/widgets/window.hpp
guichan/actionevent.cpp
guichan/basiccontainer.cpp
guichan/cliprectangle.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index a5894458d..63a5141ab 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
AUTOMAKE_OPTIONS = subdir-objects
+#AUTOMAKE_OPTIONS = subdir-objects nostdinc
bin_PROGRAMS = manaplus
@@ -21,55 +22,57 @@ else
manaplus_SOURCES =
endif
-manaplus_SOURCES += guichan/actionevent.hpp \
- guichan/actionlistener.hpp \
- guichan/basiccontainer.hpp \
- guichan/cliprectangle.hpp \
- guichan/color.hpp \
- guichan/defaultfont.hpp \
- guichan/event.hpp \
- guichan/exception.hpp \
- guichan/focushandler.hpp \
- guichan/focuslistener.hpp \
- guichan/font.hpp \
- guichan/graphics.hpp \
- guichan/gui.hpp \
- guichan/image.hpp \
- guichan/imageloader.hpp \
- guichan/input.hpp \
- guichan/inputevent.hpp \
- guichan/key.hpp \
- guichan/keyevent.hpp \
- guichan/keyinput.hpp \
- guichan/keylistener.hpp \
- guichan/listmodel.hpp \
- guichan/mouseevent.hpp \
- guichan/mouseinput.hpp \
- guichan/mouselistener.hpp \
- guichan/platform.hpp \
- guichan/rectangle.hpp \
- guichan/selectionevent.hpp \
- guichan/sdl/sdlgraphics.hpp \
- guichan/sdl/sdlimage.hpp \
- guichan/sdl/sdlpixel.hpp \
- guichan/widget.hpp \
- guichan/widgetlistener.hpp \
- guichan/widgets/button.hpp \
- guichan/widgets/checkbox.hpp \
- guichan/widgets/container.hpp \
- guichan/widgets/dropdown.hpp \
- guichan/widgets/icon.hpp \
- guichan/widgets/imagebutton.hpp \
- guichan/widgets/label.hpp \
- guichan/widgets/listbox.hpp \
- guichan/widgets/radiobutton.hpp \
- guichan/widgets/scrollarea.hpp \
- guichan/widgets/slider.hpp \
- guichan/widgets/tabbedarea.hpp \
- guichan/widgets/tab.hpp \
- guichan/widgets/textbox.hpp \
- guichan/widgets/textfield.hpp \
- guichan/widgets/window.hpp
+if USE_INTERNALGUICHAN
+manaplus_CXXFLAGS += -DUSE_INTERNALGUICHAN
+manaplus_SOURCES += guichan/include/guichan/actionevent.hpp \
+ guichan/include/guichan/actionlistener.hpp \
+ guichan/include/guichan/basiccontainer.hpp \
+ guichan/include/guichan/cliprectangle.hpp \
+ guichan/include/guichan/color.hpp \
+ guichan/include/guichan/defaultfont.hpp \
+ guichan/include/guichan/event.hpp \
+ guichan/include/guichan/exception.hpp \
+ guichan/include/guichan/focushandler.hpp \
+ guichan/include/guichan/focuslistener.hpp \
+ guichan/include/guichan/font.hpp \
+ guichan/include/guichan/graphics.hpp \
+ guichan/include/guichan/gui.hpp \
+ guichan/include/guichan/image.hpp \
+ guichan/include/guichan/imageloader.hpp \
+ guichan/include/guichan/input.hpp \
+ guichan/include/guichan/inputevent.hpp \
+ guichan/include/guichan/key.hpp \
+ guichan/include/guichan/keyevent.hpp \
+ guichan/include/guichan/keyinput.hpp \
+ guichan/include/guichan/keylistener.hpp \
+ guichan/include/guichan/listmodel.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/sdl/sdlgraphics.hpp \
+ guichan/include/guichan/sdl/sdlimage.hpp \
+ guichan/include/guichan/sdl/sdlpixel.hpp \
+ guichan/include/guichan/widget.hpp \
+ guichan/include/guichan/widgetlistener.hpp \
+ guichan/include/guichan/widgets/button.hpp \
+ guichan/include/guichan/widgets/checkbox.hpp \
+ guichan/include/guichan/widgets/container.hpp \
+ guichan/include/guichan/widgets/dropdown.hpp \
+ guichan/include/guichan/widgets/icon.hpp \
+ guichan/include/guichan/widgets/imagebutton.hpp \
+ guichan/include/guichan/widgets/label.hpp \
+ guichan/include/guichan/widgets/listbox.hpp \
+ guichan/include/guichan/widgets/radiobutton.hpp \
+ guichan/include/guichan/widgets/scrollarea.hpp \
+ guichan/include/guichan/widgets/slider.hpp \
+ guichan/include/guichan/widgets/tabbedarea.hpp \
+ guichan/include/guichan/widgets/tab.hpp \
+ guichan/include/guichan/widgets/textbox.hpp \
+ guichan/include/guichan/widgets/textfield.hpp \
+ guichan/include/guichan/widgets/window.hpp
manaplus_SOURCES += guichan/actionevent.cpp \
guichan/basiccontainer.cpp \
@@ -110,6 +113,7 @@ manaplus_SOURCES += guichan/actionevent.cpp \
guichan/widgets/textbox.cpp \
guichan/widgets/textfield.cpp \
guichan/widgets/window.cpp
+endif
manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/avatarlistbox.h \
diff --git a/src/guichan/actionevent.hpp b/src/guichan/include/guichan/actionevent.hpp
index c897e9b4b..c897e9b4b 100644
--- a/src/guichan/actionevent.hpp
+++ b/src/guichan/include/guichan/actionevent.hpp
diff --git a/src/guichan/actionlistener.hpp b/src/guichan/include/guichan/actionlistener.hpp
index 0f750099c..0f750099c 100644
--- a/src/guichan/actionlistener.hpp
+++ b/src/guichan/include/guichan/actionlistener.hpp
diff --git a/src/guichan/basiccontainer.hpp b/src/guichan/include/guichan/basiccontainer.hpp
index 269a5ba44..269a5ba44 100644
--- a/src/guichan/basiccontainer.hpp
+++ b/src/guichan/include/guichan/basiccontainer.hpp
diff --git a/src/guichan/cliprectangle.hpp b/src/guichan/include/guichan/cliprectangle.hpp
index 792c40bb9..792c40bb9 100644
--- a/src/guichan/cliprectangle.hpp
+++ b/src/guichan/include/guichan/cliprectangle.hpp
diff --git a/src/guichan/color.hpp b/src/guichan/include/guichan/color.hpp
index b7e324c07..b7e324c07 100644
--- a/src/guichan/color.hpp
+++ b/src/guichan/include/guichan/color.hpp
diff --git a/src/guichan/defaultfont.hpp b/src/guichan/include/guichan/defaultfont.hpp
index e5a830e4c..e5a830e4c 100644
--- a/src/guichan/defaultfont.hpp
+++ b/src/guichan/include/guichan/defaultfont.hpp
diff --git a/src/guichan/event.hpp b/src/guichan/include/guichan/event.hpp
index 107e34fc2..107e34fc2 100644
--- a/src/guichan/event.hpp
+++ b/src/guichan/include/guichan/event.hpp
diff --git a/src/guichan/exception.hpp b/src/guichan/include/guichan/exception.hpp
index 3ccf39e20..3ccf39e20 100644
--- a/src/guichan/exception.hpp
+++ b/src/guichan/include/guichan/exception.hpp
diff --git a/src/guichan/focushandler.hpp b/src/guichan/include/guichan/focushandler.hpp
index 49bb4e2e5..49bb4e2e5 100644
--- a/src/guichan/focushandler.hpp
+++ b/src/guichan/include/guichan/focushandler.hpp
diff --git a/src/guichan/focuslistener.hpp b/src/guichan/include/guichan/focuslistener.hpp
index 8e3f63d71..8e3f63d71 100644
--- a/src/guichan/focuslistener.hpp
+++ b/src/guichan/include/guichan/focuslistener.hpp
diff --git a/src/guichan/font.hpp b/src/guichan/include/guichan/font.hpp
index cda4028b8..cda4028b8 100644
--- a/src/guichan/font.hpp
+++ b/src/guichan/include/guichan/font.hpp
diff --git a/src/guichan/graphics.hpp b/src/guichan/include/guichan/graphics.hpp
index d21eab24b..d21eab24b 100644
--- a/src/guichan/graphics.hpp
+++ b/src/guichan/include/guichan/graphics.hpp
diff --git a/src/guichan/gui.hpp b/src/guichan/include/guichan/gui.hpp
index 17d49c979..17d49c979 100644
--- a/src/guichan/gui.hpp
+++ b/src/guichan/include/guichan/gui.hpp
diff --git a/src/guichan/image.hpp b/src/guichan/include/guichan/image.hpp
index e3bd27f69..e3bd27f69 100644
--- a/src/guichan/image.hpp
+++ b/src/guichan/include/guichan/image.hpp
diff --git a/src/guichan/imageloader.hpp b/src/guichan/include/guichan/imageloader.hpp
index 7c0adb842..7c0adb842 100644
--- a/src/guichan/imageloader.hpp
+++ b/src/guichan/include/guichan/imageloader.hpp
diff --git a/src/guichan/input.hpp b/src/guichan/include/guichan/input.hpp
index 7510d3cb2..7510d3cb2 100644
--- a/src/guichan/input.hpp
+++ b/src/guichan/include/guichan/input.hpp
diff --git a/src/guichan/inputevent.hpp b/src/guichan/include/guichan/inputevent.hpp
index 8594d3dae..8594d3dae 100644
--- a/src/guichan/inputevent.hpp
+++ b/src/guichan/include/guichan/inputevent.hpp
diff --git a/src/guichan/key.hpp b/src/guichan/include/guichan/key.hpp
index 0b550dcca..0b550dcca 100644
--- a/src/guichan/key.hpp
+++ b/src/guichan/include/guichan/key.hpp
diff --git a/src/guichan/keyevent.hpp b/src/guichan/include/guichan/keyevent.hpp
index f42601235..f42601235 100644
--- a/src/guichan/keyevent.hpp
+++ b/src/guichan/include/guichan/keyevent.hpp
diff --git a/src/guichan/keyinput.hpp b/src/guichan/include/guichan/keyinput.hpp
index 68c58fa0d..68c58fa0d 100644
--- a/src/guichan/keyinput.hpp
+++ b/src/guichan/include/guichan/keyinput.hpp
diff --git a/src/guichan/keylistener.hpp b/src/guichan/include/guichan/keylistener.hpp
index caeed0da4..caeed0da4 100644
--- a/src/guichan/keylistener.hpp
+++ b/src/guichan/include/guichan/keylistener.hpp
diff --git a/src/guichan/listmodel.hpp b/src/guichan/include/guichan/listmodel.hpp
index 1beae317b..1beae317b 100644
--- a/src/guichan/listmodel.hpp
+++ b/src/guichan/include/guichan/listmodel.hpp
diff --git a/src/guichan/mouseevent.hpp b/src/guichan/include/guichan/mouseevent.hpp
index 280d373e6..280d373e6 100644
--- a/src/guichan/mouseevent.hpp
+++ b/src/guichan/include/guichan/mouseevent.hpp
diff --git a/src/guichan/mouseinput.hpp b/src/guichan/include/guichan/mouseinput.hpp
index 3825d5439..3825d5439 100644
--- a/src/guichan/mouseinput.hpp
+++ b/src/guichan/include/guichan/mouseinput.hpp
diff --git a/src/guichan/mouselistener.hpp b/src/guichan/include/guichan/mouselistener.hpp
index 152d3494e..152d3494e 100644
--- a/src/guichan/mouselistener.hpp
+++ b/src/guichan/include/guichan/mouselistener.hpp
diff --git a/src/guichan/platform.hpp b/src/guichan/include/guichan/platform.hpp
index e2ea89767..e2ea89767 100644
--- a/src/guichan/platform.hpp
+++ b/src/guichan/include/guichan/platform.hpp
diff --git a/src/guichan/rectangle.hpp b/src/guichan/include/guichan/rectangle.hpp
index 1d21654df..1d21654df 100644
--- a/src/guichan/rectangle.hpp
+++ b/src/guichan/include/guichan/rectangle.hpp
diff --git a/src/guichan/sdl/sdlgraphics.hpp b/src/guichan/include/guichan/sdl/sdlgraphics.hpp
index 70a234d33..70a234d33 100644
--- a/src/guichan/sdl/sdlgraphics.hpp
+++ b/src/guichan/include/guichan/sdl/sdlgraphics.hpp
diff --git a/src/guichan/sdl/sdlimage.hpp b/src/guichan/include/guichan/sdl/sdlimage.hpp
index 4d226177e..4d226177e 100644
--- a/src/guichan/sdl/sdlimage.hpp
+++ b/src/guichan/include/guichan/sdl/sdlimage.hpp
diff --git a/src/guichan/sdl/sdlpixel.hpp b/src/guichan/include/guichan/sdl/sdlpixel.hpp
index 675b10fcd..675b10fcd 100644
--- a/src/guichan/sdl/sdlpixel.hpp
+++ b/src/guichan/include/guichan/sdl/sdlpixel.hpp
diff --git a/src/guichan/selectionevent.hpp b/src/guichan/include/guichan/selectionevent.hpp
index 6724fa0d2..6724fa0d2 100644
--- a/src/guichan/selectionevent.hpp
+++ b/src/guichan/include/guichan/selectionevent.hpp
diff --git a/src/guichan/widget.hpp b/src/guichan/include/guichan/widget.hpp
index 0f8c803ca..0f8c803ca 100644
--- a/src/guichan/widget.hpp
+++ b/src/guichan/include/guichan/widget.hpp
diff --git a/src/guichan/widgetlistener.hpp b/src/guichan/include/guichan/widgetlistener.hpp
index eb1f838ec..eb1f838ec 100644
--- a/src/guichan/widgetlistener.hpp
+++ b/src/guichan/include/guichan/widgetlistener.hpp
diff --git a/src/guichan/widgets/button.hpp b/src/guichan/include/guichan/widgets/button.hpp
index 05b961b1e..05b961b1e 100644
--- a/src/guichan/widgets/button.hpp
+++ b/src/guichan/include/guichan/widgets/button.hpp
diff --git a/src/guichan/widgets/checkbox.hpp b/src/guichan/include/guichan/widgets/checkbox.hpp
index ad43e2896..ad43e2896 100644
--- a/src/guichan/widgets/checkbox.hpp
+++ b/src/guichan/include/guichan/widgets/checkbox.hpp
diff --git a/src/guichan/widgets/container.hpp b/src/guichan/include/guichan/widgets/container.hpp
index 4946b1f74..4946b1f74 100644
--- a/src/guichan/widgets/container.hpp
+++ b/src/guichan/include/guichan/widgets/container.hpp
diff --git a/src/guichan/widgets/dropdown.hpp b/src/guichan/include/guichan/widgets/dropdown.hpp
index 5853783e5..5853783e5 100644
--- a/src/guichan/widgets/dropdown.hpp
+++ b/src/guichan/include/guichan/widgets/dropdown.hpp
diff --git a/src/guichan/widgets/icon.hpp b/src/guichan/include/guichan/widgets/icon.hpp
index f0f9ff566..f0f9ff566 100644
--- a/src/guichan/widgets/icon.hpp
+++ b/src/guichan/include/guichan/widgets/icon.hpp
diff --git a/src/guichan/widgets/imagebutton.hpp b/src/guichan/include/guichan/widgets/imagebutton.hpp
index 1ab285ce9..1ab285ce9 100644
--- a/src/guichan/widgets/imagebutton.hpp
+++ b/src/guichan/include/guichan/widgets/imagebutton.hpp
diff --git a/src/guichan/widgets/label.hpp b/src/guichan/include/guichan/widgets/label.hpp
index 4d6ea0006..4d6ea0006 100644
--- a/src/guichan/widgets/label.hpp
+++ b/src/guichan/include/guichan/widgets/label.hpp
diff --git a/src/guichan/widgets/listbox.hpp b/src/guichan/include/guichan/widgets/listbox.hpp
index b99f84aaa..b99f84aaa 100644
--- a/src/guichan/widgets/listbox.hpp
+++ b/src/guichan/include/guichan/widgets/listbox.hpp
diff --git a/src/guichan/widgets/radiobutton.hpp b/src/guichan/include/guichan/widgets/radiobutton.hpp
index 0fb5b4123..0fb5b4123 100644
--- a/src/guichan/widgets/radiobutton.hpp
+++ b/src/guichan/include/guichan/widgets/radiobutton.hpp
diff --git a/src/guichan/widgets/scrollarea.hpp b/src/guichan/include/guichan/widgets/scrollarea.hpp
index 0b2ccad92..0b2ccad92 100644
--- a/src/guichan/widgets/scrollarea.hpp
+++ b/src/guichan/include/guichan/widgets/scrollarea.hpp
diff --git a/src/guichan/widgets/slider.hpp b/src/guichan/include/guichan/widgets/slider.hpp
index eddf02c50..eddf02c50 100644
--- a/src/guichan/widgets/slider.hpp
+++ b/src/guichan/include/guichan/widgets/slider.hpp
diff --git a/src/guichan/widgets/tab.hpp b/src/guichan/include/guichan/widgets/tab.hpp
index d123bac15..d123bac15 100644
--- a/src/guichan/widgets/tab.hpp
+++ b/src/guichan/include/guichan/widgets/tab.hpp
diff --git a/src/guichan/widgets/tabbedarea.hpp b/src/guichan/include/guichan/widgets/tabbedarea.hpp
index 843bbde81..843bbde81 100644
--- a/src/guichan/widgets/tabbedarea.hpp
+++ b/src/guichan/include/guichan/widgets/tabbedarea.hpp
diff --git a/src/guichan/widgets/textbox.hpp b/src/guichan/include/guichan/widgets/textbox.hpp
index b00dcef20..b00dcef20 100644
--- a/src/guichan/widgets/textbox.hpp
+++ b/src/guichan/include/guichan/widgets/textbox.hpp
diff --git a/src/guichan/widgets/textfield.hpp b/src/guichan/include/guichan/widgets/textfield.hpp
index 486660a8a..486660a8a 100644
--- a/src/guichan/widgets/textfield.hpp
+++ b/src/guichan/include/guichan/widgets/textfield.hpp
diff --git a/src/guichan/widgets/window.hpp b/src/guichan/include/guichan/widgets/window.hpp
index 63685c7fb..63685c7fb 100644
--- a/src/guichan/widgets/window.hpp
+++ b/src/guichan/include/guichan/widgets/window.hpp