Split up the graphtool files

src/dialogxml/widgets/button.cpp

@@ -14,7 +14,7 @@
 #include <algorithm>
 
 #include "dialog.hpp"
-#include "graphtool.hpp"
+#include "render_image.hpp"
 
 #include <cmath>
 #include <climits>

src/dialogxml/widgets/button.hpp

@@ -18,7 +18,7 @@
 #include <map>
 #include <vector>
 #include "control.hpp"
-#include "graphtool.hpp" // for eFont
+#include "render_text.hpp"
 
 /// A button type.
 enum eBtnType {	// w x h

src/dialogxml/widgets/control.cpp

@@ -11,7 +11,7 @@
 #include "dialog.hpp"
 #include "sounds.hpp"
 #include "button.hpp"
-#include "graphtool.hpp"
+#include "render_shapes.hpp"
 #include "res_image.hpp"
 #include "mathutil.hpp"
 #include "prefs.hpp"

src/dialogxml/widgets/field.cpp

@@ -13,7 +13,7 @@
 #include <boost/lexical_cast.hpp>
 #include "dialog.hpp"
 #include "strdlog.hpp"
-#include "graphtool.hpp"
+#include "render_shapes.hpp"
 #include "winutil.hpp"
 #include "cursors.hpp"
 

src/dialogxml/widgets/field.hpp

@@ -14,7 +14,7 @@
 
 #include <string>
 #include "control.hpp"
-#include "graphtool.hpp"
+#include "render_text.hpp"
 #include "undo.hpp"
 
 /// The field's expected input type.

src/dialogxml/widgets/message.cpp

@@ -7,7 +7,6 @@
  */
 
 #include "message.hpp"
-#include "graphtool.hpp"
 #include "mathutil.hpp"
 #include "dialog.hpp"
 

src/dialogxml/widgets/message.hpp

@@ -16,7 +16,7 @@
 
 #include <string>
 #include "control.hpp"
-#include "graphtool.hpp" // for eFont
+#include "render_text.hpp"
 
 /// A simple static text message.
 /// This class can also create a frame for grouping controls or a clickable area.

src/dialogxml/widgets/pict.cpp

@@ -11,7 +11,12 @@
 #include <map>
 #include <stdexcept>
 
-#include "graphtool.hpp"
+#include "gfxsheets.hpp"
+#include "render_shapes.hpp"
+#include "render_image.hpp"
+#include "render_text.hpp"
+#include "tiling.hpp"
+#include "location.hpp"
 #include "dialog.hpp"
 #include "res_image.hpp"
 

src/dialogxml/widgets/pictypes.hpp

@@ -12,8 +12,6 @@
 /// @file
 /// Constants to specify the type of an icon
 
-typedef signed short pic_num_t; ///< An icon's unique number
-
 /// Specifies an icon type.
 enum ePicType {
 	PIC_TER = 1,				///< 28x36 terrain graphic from the preset sheets

src/dialogxml/widgets/scrollbar.cpp

@@ -8,7 +8,8 @@
 
 #include "scrollbar.hpp"
 #include "res_image.hpp"
-#include "graphtool.hpp"
+#include "render_image.hpp"
+#include "render_shapes.hpp"
 #include "mathutil.hpp"
 #include "cursors.hpp"
 

src/dialogxml/widgets/scrollbar.hpp

@@ -13,7 +13,6 @@
 /// Scrollbar-related classes and types.
 
 #include "control.hpp"
-#include "graphtool.hpp"
 
 /// Specifies the style of a scrollbar.
 enum eScrollStyle {

src/dialogxml/widgets/scrollpane.cpp

@@ -12,6 +12,7 @@
 #include "button.hpp"
 #include "pict.hpp"
 #include "stack.hpp"
+#include "render_shapes.hpp"
 
 cScrollPane::cScrollPane(cDialog& parent) : cContainer(CTRL_PANE, parent), scroll(parent) {
 	recalcRect();