Merged r2829 from trunk (Merged the definition of ImageRect into graphics.h)

13 files changed, 32 insertions, 68 deletions

diff --git a/ChangeLog b/ChangeLog
index 025bb40c..5f5e7ed1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -362,6 +362,12 @@
 	wallpaper.
 	* src/resources/resourcemanager.cpp: More useful logging about
 	resources that are being loaded (including source).
+	* src/graphics.cpp, src/gui/window.cpp, src/gui/button.cpp,
+	src/gui/widgets/dropdown.cpp, src/gui/textfield.cpp,
+	src/gui/playerbox.cpp, src/gui/progressbar.cpp,
+	src/gui/scrollarea.cpp, src/graphics.h, src/CMakeLists.txt,
+	src/Makefile.am, src/graphic, src/graphic/imagerect.h: Merged the
+	definition of ImageRect into graphics.h.
 
 2006-11-05  Yohann Ferreira  <bertram@cegetel.net>
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e5a3f43c..18804e73 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,7 +37,6 @@ INCLUDE_DIRECTORIES(
     )
 
 SET(SRCS
-    graphic/imagerect.h
     gui/browserbox.cpp
     gui/browserbox.h
     gui/buddywindow.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 75caad07..c76fe674 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,5 @@
 bin_PROGRAMS = tmw
-tmw_SOURCES = graphic/imagerect.h \
-	      gui/browserbox.cpp \
+tmw_SOURCES = gui/browserbox.cpp \
 	      gui/browserbox.h \
 	      gui/buddywindow.cpp \
 	      gui/buddywindow.h \
diff --git a/src/graphic/imagerect.h b/src/graphic/imagerect.h
deleted file mode 100644
index be63d4ac..00000000
--- a/src/graphic/imagerect.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World 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
- *  any later version.
- *
- *  The Mana World 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 The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#ifndef _TMW_IMAGERECT_H
-#define _TMW_IMAGERECT_H
-
-class Image;
-
-/**
- * 9 images defining a rectangle. 4 corners, 4 sides and a middle area. The
- * topology is as follows:
- *
- * <pre>
- *  !-----!-----------------!-----!
- *  !  0  !        1        !  2  !
- *  !-----!-----------------!-----!
- *  !  3  !        4        !  5  !
- *  !-----!-----------------!-----!
- *  !  6  !        7        !  8  !
- *  !-----!-----------------!-----!
- * </pre>
- *
- * Sections 0, 2, 6 and 8 will remain as is. 1, 3, 4, 5 and 7 will be
- * repeated to fit the size of the widget.
- */
-struct ImageRect {
-    Image *grid[9];
-};
-
-#endif
diff --git a/src/graphics.cpp b/src/graphics.cpp
index b70fdeea..f007470a 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -25,8 +25,6 @@
 
 #include "log.h"
 
-#include "graphic/imagerect.h"
-
 #include "resources/image.h"
 
 Graphics::Graphics():
diff --git a/src/graphics.h b/src/graphics.h
index 3c060e97..b3d36653 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -32,6 +32,27 @@ class ImageRect;
 class SDL_Surface;
 
 /**
+ * 9 images defining a rectangle. 4 corners, 4 sides and a middle area. The
+ * topology is as follows:
+ *
+ * <pre>
+ *  !-----!-----------------!-----!
+ *  !  0  !        1        !  2  !
+ *  !-----!-----------------!-----!
+ *  !  3  !        4        !  5  !
+ *  !-----!-----------------!-----!
+ *  !  6  !        7        !  8  !
+ *  !-----!-----------------!-----!
+ * </pre>
+ *
+ * Sections 0, 2, 6 and 8 will remain as is. 1, 3, 4, 5 and 7 will be
+ * repeated to fit the size of the widget.
+ */
+struct ImageRect {
+    Image *grid[9];
+};
+
+/**
  * A central point of control for graphics.
  */
 class Graphics : public gcn::SDLGraphics {
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index 9d01095b..31f38593 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -29,8 +29,6 @@
 
 #include "../graphics.h"
 
-#include "../graphic/imagerect.h"
-
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
 
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 907e9a2d..5fbe79b7 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -26,8 +26,6 @@
 #include "../player.h"
 #include "../graphics.h"
 
-#include "../graphic/imagerect.h"
-
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
 #include "../resources/spriteset.h"
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 5f047c6a..2bdfc856 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -25,8 +25,6 @@
 
 #include "../graphics.h"
 
-#include "../graphic/imagerect.h"
-
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
 
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 18a1dfb4..903ec95d 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -25,8 +25,6 @@
 
 #include "../graphics.h"
 
-#include "../graphic/imagerect.h"
-
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
 
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index 2e083d5a..adf41a9a 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -27,8 +27,6 @@
 
 #include "../graphics.h"
 
-#include "../graphic/imagerect.h"
-
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
 
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 51386eed..648b3763 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -33,8 +33,6 @@
 #include "../graphics.h"
 #include "../log.h"
 
-#include "../graphic/imagerect.h"
-
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
 
diff --git a/src/guichanfwd.h b/src/guichanfwd.h
index 5eabc783..812f3f7a 100644
--- a/src/guichanfwd.h
+++ b/src/guichanfwd.h
@@ -27,6 +27,7 @@
 namespace gcn {
     class ActionListener;
     class AllegroGraphics;
+    class AllegroImage;
     class AllegroImageLoader;
     class AllegroInput;
     class BasicContainer;
@@ -56,11 +57,13 @@ namespace gcn {
     class MouseInput;
     class MouseListener;
     class OpenGLGraphics;
-    class OpenGLImageLoader;
+    class OpenGLImage;
+    class OpenGLSDLImageLoader;
     class RadioButton;
     class Rectangle;
     class ScrollArea;
     class SDLGraphics;
+    class SDLImage;
     class SDLImageLoader;
     class SDLInput;
     class Slider;