From 0edd8dd17c324ac0c0eec1109e0819e42b916731 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Fri, 3 Oct 2008 05:37:02 +0000 Subject: Made a new Windows binary, as well as fix some files to make the Windows build work (although there might be a bit too many guichanfwd.h references. But that's ok. I'm too lazy to track down which ones are necessary and which ones aren't at the moment). --- src/gui/button.h | 2 ++ src/gui/buttonbox.h | 2 ++ src/gui/buysell.h | 2 ++ src/gui/chargedialog.h | 2 ++ src/gui/chatinput.h | 2 ++ src/gui/checkbox.h | 2 ++ src/gui/colour.h | 2 ++ src/gui/confirm_dialog.h | 1 + src/gui/equipmentwindow.h | 2 ++ src/gui/gccontainer.h | 2 ++ src/gui/hbox.h | 2 ++ src/gui/inttextbox.h | 2 ++ src/gui/itemcontainer.h | 2 ++ src/gui/itemshortcutcontainer.h | 2 ++ src/gui/itemshortcutwindow.h | 2 ++ src/gui/listbox.h | 2 ++ src/gui/minimap.h | 2 ++ src/gui/npc_text.h | 2 ++ src/gui/ok_dialog.h | 2 ++ src/gui/passwordfield.h | 2 ++ src/gui/playerbox.h | 2 ++ src/gui/progressbar.h | 2 ++ src/gui/radiobutton.h | 3 ++- src/gui/scrollarea.h | 2 ++ src/gui/setup.h | 2 ++ src/gui/shop.h | 1 + src/gui/shoplistbox.h | 2 ++ src/gui/slider.h | 2 ++ src/gui/textbox.h | 2 ++ src/gui/textfield.h | 2 ++ src/gui/vbox.h | 2 ++ src/gui/viewport.h | 1 + src/gui/widgets/dropdown.h | 1 + src/gui/widgets/resizegrip.h | 2 ++ src/gui/windowcontainer.h | 2 ++ src/recorder.h | 2 +- src/text.h | 1 + 37 files changed, 68 insertions(+), 2 deletions(-) diff --git a/src/gui/button.h b/src/gui/button.h index 8e045a74..bbd26010 100644 --- a/src/gui/button.h +++ b/src/gui/button.h @@ -28,6 +28,8 @@ #include +#include "../guichanfwd.h" + class ImageRect; /** diff --git a/src/gui/buttonbox.h b/src/gui/buttonbox.h index 1b76e619..5fc9f88d 100644 --- a/src/gui/buttonbox.h +++ b/src/gui/buttonbox.h @@ -28,6 +28,8 @@ #include +#include "../guichanfwd.h" + #include "window.h" class ButtonBoxListener diff --git a/src/gui/buysell.h b/src/gui/buysell.h index 64c37e39..0966ec03 100644 --- a/src/gui/buysell.h +++ b/src/gui/buysell.h @@ -26,6 +26,8 @@ #include +#include "../guichanfwd.h" + #include "window.h" /** diff --git a/src/gui/chargedialog.h b/src/gui/chargedialog.h index c09c692c..222fb3b5 100644 --- a/src/gui/chargedialog.h +++ b/src/gui/chargedialog.h @@ -25,6 +25,8 @@ #include "window.h" +#include "../guichanfwd.h" + class ProgressBar; #define CHARGE_TIME 1000 // time in milliseconds it takes to charge up an attack diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h index 6ac8c1a5..043244b9 100644 --- a/src/gui/chatinput.h +++ b/src/gui/chatinput.h @@ -26,6 +26,8 @@ #include "textfield.h" +#include "../guichanfwd.h" + #include /** diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h index 36083390..160a2bf4 100644 --- a/src/gui/checkbox.h +++ b/src/gui/checkbox.h @@ -28,6 +28,8 @@ #include +#include "../guichanfwd.h" + class Image; /** diff --git a/src/gui/colour.h b/src/gui/colour.h index 69253f95..ac75f08b 100644 --- a/src/gui/colour.h +++ b/src/gui/colour.h @@ -27,6 +27,8 @@ #include +#include "../guichanfwd.h" + class Colour : public gcn::ListModel { public: diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h index 3115485d..b8e385f6 100644 --- a/src/gui/confirm_dialog.h +++ b/src/gui/confirm_dialog.h @@ -28,6 +28,7 @@ #include "window.h" +#include "../guichanfwd.h" /** * An option dialog. diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index 0cb5cb24..bb8eb32f 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -26,6 +26,8 @@ #include "window.h" +#include "../guichanfwd.h" + class Equipment; /** diff --git a/src/gui/gccontainer.h b/src/gui/gccontainer.h index 6c6bee80..660111fc 100644 --- a/src/gui/gccontainer.h +++ b/src/gui/gccontainer.h @@ -28,6 +28,8 @@ #include +#include "../guichanfwd.h" + /** * A garbage collecting container. Childs added to this container are * automatically deleted when the container is deleted. diff --git a/src/gui/hbox.h b/src/gui/hbox.h index 99364866..93ac270d 100644 --- a/src/gui/hbox.h +++ b/src/gui/hbox.h @@ -26,6 +26,8 @@ #include "box.h" +#include "../guichanfwd.h" + class HBox : public Box { public: diff --git a/src/gui/inttextbox.h b/src/gui/inttextbox.h index 64351f48..6ade7e71 100644 --- a/src/gui/inttextbox.h +++ b/src/gui/inttextbox.h @@ -26,6 +26,8 @@ #include "textbox.h" +#include "../guichanfwd.h" + /** * TextBox which only accepts numbers as input. */ diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h index 78301669..5562023f 100644 --- a/src/gui/itemcontainer.h +++ b/src/gui/itemcontainer.h @@ -30,6 +30,8 @@ #include +#include "../guichanfwd.h" + class Image; class Inventory; class Item; diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h index 7698755b..cc4e830a 100644 --- a/src/gui/itemshortcutcontainer.h +++ b/src/gui/itemshortcutcontainer.h @@ -28,6 +28,8 @@ #include #include +#include "../guichanfwd.h" + class Image; class Item; diff --git a/src/gui/itemshortcutwindow.h b/src/gui/itemshortcutwindow.h index 5f7ba3d7..112c39d9 100644 --- a/src/gui/itemshortcutwindow.h +++ b/src/gui/itemshortcutwindow.h @@ -26,6 +26,8 @@ #include "window.h" +#include "../guichanfwd.h" + class ItemShortcutContainer; class ScrollArea; diff --git a/src/gui/listbox.h b/src/gui/listbox.h index ec95734d..2f501a6c 100644 --- a/src/gui/listbox.h +++ b/src/gui/listbox.h @@ -26,6 +26,8 @@ #include +#include "../guichanfwd.h" + class SelectionListener; /** diff --git a/src/gui/minimap.h b/src/gui/minimap.h index d2640caa..0ec13e67 100644 --- a/src/gui/minimap.h +++ b/src/gui/minimap.h @@ -26,6 +26,8 @@ #include "window.h" +#include "../guichanfwd.h" + class Image; /** diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h index 9e2b4ecd..c9f13454 100644 --- a/src/gui/npc_text.h +++ b/src/gui/npc_text.h @@ -29,6 +29,8 @@ #include "window.h" +#include "../guichanfwd.h" + class TextBox; /** diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h index 1c8e0c18..47a0c780 100644 --- a/src/gui/ok_dialog.h +++ b/src/gui/ok_dialog.h @@ -28,6 +28,8 @@ #include "window.h" +#include "../guichanfwd.h" + /** * An 'Ok' button dialog. * diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h index 725bfbcf..8228bfe2 100644 --- a/src/gui/passwordfield.h +++ b/src/gui/passwordfield.h @@ -26,6 +26,8 @@ #include "textfield.h" +#include "../guichanfwd.h" + /** * A password field. * diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h index 0aa48a2c..86cdf064 100644 --- a/src/gui/playerbox.h +++ b/src/gui/playerbox.h @@ -26,6 +26,8 @@ #include +#include "../guichanfwd.h" + class ImageRect; class Player; diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h index ed8eace4..df825a5d 100644 --- a/src/gui/progressbar.h +++ b/src/gui/progressbar.h @@ -28,6 +28,8 @@ #include +#include "../guichanfwd.h" + class ImageRect; diff --git a/src/gui/radiobutton.h b/src/gui/radiobutton.h index bab4a9dc..ef87dccd 100644 --- a/src/gui/radiobutton.h +++ b/src/gui/radiobutton.h @@ -26,8 +26,9 @@ #include -class Image; +#include "../guichanfwd.h" +class Image; /* * Guichan based RadioButton with custom look diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h index b3fa17f3..32a192fc 100644 --- a/src/gui/scrollarea.h +++ b/src/gui/scrollarea.h @@ -26,6 +26,8 @@ #include +#include "../guichanfwd.h" + class Image; class ImageRect; diff --git a/src/gui/setup.h b/src/gui/setup.h index d4f0857b..c24b8cb9 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -30,6 +30,8 @@ #include "window.h" +#include "../guichanfwd.h" + class SetupTab; /** diff --git a/src/gui/shop.h b/src/gui/shop.h index 78276610..8dfda67e 100644 --- a/src/gui/shop.h +++ b/src/gui/shop.h @@ -32,6 +32,7 @@ #include "../resources/image.h" #include "../shopitem.h" +#include "../guichanfwd.h" class ShopItems : public gcn::ListModel { diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h index 837f745f..5840e47f 100644 --- a/src/gui/shoplistbox.h +++ b/src/gui/shoplistbox.h @@ -27,6 +27,8 @@ #include "listbox.h" #include "shop.h" +#include "../guichanfwd.h" + /** * A list box, meant to be used inside a scroll area. Same as the Guichan list * box except this one doesn't have a background, instead completely relying diff --git a/src/gui/slider.h b/src/gui/slider.h index 524d8799..5700d64d 100644 --- a/src/gui/slider.h +++ b/src/gui/slider.h @@ -26,6 +26,8 @@ #include +#include "../guichanfwd.h" + class Image; diff --git a/src/gui/textbox.h b/src/gui/textbox.h index 09819360..6f4db7dd 100644 --- a/src/gui/textbox.h +++ b/src/gui/textbox.h @@ -26,6 +26,8 @@ #include +#include "../guichanfwd.h" + /** * A text box, meant to be used inside a scroll area. Same as the Guichan text * box except this one doesn't have a background or border, instead completely diff --git a/src/gui/textfield.h b/src/gui/textfield.h index 0fc53f39..60766676 100644 --- a/src/gui/textfield.h +++ b/src/gui/textfield.h @@ -26,6 +26,8 @@ #include +#include "../guichanfwd.h" + class ImageRect; class TextField; diff --git a/src/gui/vbox.h b/src/gui/vbox.h index ff52717b..fd029143 100644 --- a/src/gui/vbox.h +++ b/src/gui/vbox.h @@ -26,6 +26,8 @@ #include "box.h" +#include "../guichanfwd.h" + class VBox : public Box { public: diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 325a7221..70ac1bea 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -30,6 +30,7 @@ #include "../configlistener.h" #include "../being.h" +#include "../guichanfwd.h" class Map; class FloorItem; diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index d0dab7d2..9f6491b7 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -29,6 +29,7 @@ #include #include "../scrollarea.h" #include "../listbox.h" +#include "../../guichanfwd.h" class Image; class ImageRect; diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h index dab720dd..03a9228f 100644 --- a/src/gui/widgets/resizegrip.h +++ b/src/gui/widgets/resizegrip.h @@ -26,6 +26,8 @@ #include +#include "../../guichanfwd.h" + class Image; /** diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h index 294c855b..c9728230 100644 --- a/src/gui/windowcontainer.h +++ b/src/gui/windowcontainer.h @@ -26,6 +26,8 @@ #include +#include "../guichanfwd.h" + /** * A window container. This container adds functionality for more convenient * widget (windows in particular) destruction. diff --git a/src/recorder.h b/src/recorder.h index 2795cd53..de8e7f3e 100644 --- a/src/recorder.h +++ b/src/recorder.h @@ -40,7 +40,7 @@ class Recorder : public ButtonBoxListener void help() const; void help(const std::string &args) const; void buttonBoxRespond(); - bool isRecording() const {return mStream.is_open();} + bool isRecording() const {return mStream;} ~Recorder(); private: ChatWindow *mChat; diff --git a/src/text.h b/src/text.h index 19d75018..67454e30 100644 --- a/src/text.h +++ b/src/text.h @@ -23,6 +23,7 @@ #define _AETHYRA_TEXT_H #include "graphics.h" +#include "guichanfwd.h" #include -- cgit v1.2.3-70-g09d2