[Pingus-CVS] CVS: Games/Pingus/src/editor action_window.cxx,1.6,1.7 action_window.hxx,1.4,1.5 editor.cxx,1.24,1.25 editor_event.cxx,1.27,1.28 editor_help_screen.hxx,1.2,1.3 editor_view.hxx,1.2,1.3 editorobj.hxx,1.11,1.12 entrance_window.hxx,1.3,1.4 exit_window.hxx,1.1,1.2 groundpiece_window.hxx,1.5,1.6 level_property_window.cxx,1.5,1.6 level_property_window.hxx,1.4,1.5 object_manager.cxx,1.24,1.25 panel.hxx,1.4,1.5 property_frame.hxx,1.2,1.3 property_window.cxx,1.8,1.9 property_window.hxx,1.4,1.5 selection.cxx,1.11,1.12 status_line.hxx,1.6,1.7 string_reader.hxx,1.3,1.4 surface_selector.hxx,1.4,1.5 thumb_cache.hxx,1.4,1.5

[torangan]

Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv7129/editor

Modified Files:
        action_window.cxx action_window.hxx editor.cxx 
        editor_event.cxx editor_help_screen.hxx editor_view.hxx 
        editorobj.hxx entrance_window.hxx exit_window.hxx 
        groundpiece_window.hxx level_property_window.cxx 
        level_property_window.hxx object_manager.cxx panel.hxx 
        property_frame.hxx property_window.cxx property_window.hxx 
        selection.cxx status_line.hxx string_reader.hxx 
        surface_selector.hxx thumb_cache.hxx 
Log Message:
- included src/pingus.hxx in every header not containing other pingus headers
- changed ClanLib/gui.h includes to the really required headers


Index: action_window.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/action_window.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- action_window.cxx   8 Jul 2002 17:05:09 -0000       1.6
+++ action_window.cxx   16 Aug 2002 13:03:35 -0000      1.7
@@ -19,6 +19,11 @@
 
 #include <iostream>
 #include <algorithm>
+#include <ClanLib/GUI/button.h>
+#include <ClanLib/GUI/window.h>
+#include <ClanLib/GUI/checkbox.h>
+#include <ClanLib/GUI/inputbox.h>
+#include <ClanLib/Core/Math/rect.h>
 #include "../string_converter.hxx"
 #include "action_window.hxx"
 

Index: action_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/action_window.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- action_window.hxx   29 Jun 2002 14:01:32 -0000      1.4
+++ action_window.hxx   16 Aug 2002 13:03:35 -0000      1.5
@@ -20,9 +20,15 @@
 #ifndef HEADER_PINGUS_EDITOR_ACTION_WINDOW_HXX
 #define HEADER_PINGUS_EDITOR_ACTION_WINDOW_HXX
 
-#include <ClanLib/gui.h>
+#include <ClanLib/Signals/slot.h>
 #include <vector>
 #include "../action_data.hxx"
+
+class CL_Button;
+class CL_Window;
+class CL_CheckBox;
+class CL_InputBox;
+class CL_Component;
 
 class ActionWindow
 {

Index: editor.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- editor.cxx  14 Aug 2002 12:45:02 -0000      1.24
+++ editor.cxx  16 Aug 2002 13:03:35 -0000      1.25
@@ -17,11 +17,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifdef WIN32
-#pragma warning(disable:4786)
-#endif
-
 #include <ClanLib/Core/System/system.h>
+#include <ClanLib/Core/Resources/resource_manager.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Input/input.h>
 #include <ClanLib/Display/Display/mousecursor_provider.h>
@@ -29,6 +26,8 @@
 #include <ClanLib/Display/Font/font.h>
 #include <ClanLib/Display/Input/inputbuffer.h>
 #include <ClanLib/Display/Input/keyboard.h>
+#include <ClanLib/GUI/gui_manager.h>
+#include <ClanLib/GUI/stylemanager_default.h>
 #include "../globals.hxx"
 #include "../display.hxx"
 #include "../pingus_resource.hxx"

Index: editor_event.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_event.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- editor_event.cxx    4 Aug 2002 20:27:22 -0000       1.27
+++ editor_event.cxx    16 Aug 2002 13:03:36 -0000      1.28
@@ -19,11 +19,12 @@
 
 #include <stdio.h>
 #include <fstream>
+#include <ClanLib/GUI/gui_manager.h>
+#include <ClanLib/Core/System/error.h>
 #include <ClanLib/Display/Input/input.h>
 #include <ClanLib/Display/Input/keyboard.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Input/mouse.h>
-
 #include "../html_browser.hxx"
 #include "../debug.hxx"
 #include "../globals.hxx"
@@ -438,7 +439,7 @@
           j != object_manager->editor_objs.end();
           j++)
        {
-         for (vector<EditorObj*>::const_iterator i = 
selection->get_objects().begin();
+         for (std::vector<EditorObj*>::const_iterator i = 
selection->get_objects().begin();
               i != selection->get_objects().end();
               i++)
            { 

Index: editor_help_screen.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_help_screen.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- editor_help_screen.hxx      24 Jun 2002 22:52:58 -0000      1.2
+++ editor_help_screen.hxx      16 Aug 2002 13:03:36 -0000      1.3
@@ -20,6 +20,8 @@
 #ifndef HEADER_PINGUS_EDITOR_EDITOR_HELP_SCREEN_HXX
 #define HEADER_PINGUS_EDITOR_EDITOR_HELP_SCREEN_HXX
 
+#include "../pingus.hxx"
+
 class CL_Font;
 
 class EditorHelpScreen

Index: editor_view.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_view.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- editor_view.hxx     24 Jun 2002 22:52:58 -0000      1.2
+++ editor_view.hxx     16 Aug 2002 13:03:36 -0000      1.3
@@ -21,6 +21,7 @@
 #define header_pingus_editor_editor_view_hxx
 
 #include <ClanLib/Core/Math/cl_vector.h>
+#include "../pingus.hxx"
 
 class Sprite;
 class CL_Rect;

Index: editorobj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- editorobj.hxx       3 Jul 2002 17:14:25 -0000       1.11
+++ editorobj.hxx       16 Aug 2002 13:03:36 -0000      1.12
@@ -22,6 +22,7 @@
 
 #include <string>
 #include <iosfwd>
+#include "../pingus.hxx"
 
 class CL_Rect;
 class CL_Vector;

Index: entrance_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/entrance_window.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- entrance_window.hxx 1 Jul 2002 09:09:31 -0000       1.3
+++ entrance_window.hxx 16 Aug 2002 13:03:36 -0000      1.4
@@ -20,6 +20,10 @@
 #ifndef HEADER_PINGUS_EDITOR_ENTRANCE_WINDOW_HXX
 #define HEADER_PINGUS_EDITOR_ENTRANCE_WINDOW_HXX
 
+#include <ClanLib/GUI/label.h>
+#include <ClanLib/GUI/inputbox.h>
+#include <ClanLib/GUI/radiogroup.h>
+#include <ClanLib/GUI/radiobutton.h>
 #include "property_frame.hxx"
 
 class EntranceObj;

Index: exit_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/exit_window.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exit_window.hxx     28 Jun 2002 22:21:59 -0000      1.1
+++ exit_window.hxx     16 Aug 2002 13:03:36 -0000      1.2
@@ -20,6 +20,8 @@
 #ifndef HEADER_PINGUS_EDITOR_EXIT_WINDOW_HXX
 #define HEADER_PINGUS_EDITOR_EXIT_WINDOW_HXX
 
+#include "../pingus.hxx"
+
 class ExitWindow
 {
 private:

Index: groundpiece_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/groundpiece_window.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- groundpiece_window.hxx      1 Jul 2002 09:09:31 -0000       1.5
+++ groundpiece_window.hxx      16 Aug 2002 13:03:36 -0000      1.6
@@ -20,6 +20,10 @@
 #ifndef HEADER_PINGUS_EDITOR_GROUNDPIECE_WINDOW_HXX
 #define HEADER_PINGUS_EDITOR_GROUNDPIECE_WINDOW_HXX
 
+#include <ClanLib/GUI/label.h>
+#include <ClanLib/GUI/button.h>
+#include <ClanLib/GUI/radiogroup.h>
+#include <ClanLib/GUI/radiobutton.h>
 #include "property_frame.hxx"
 #include "editor_groundpiece_obj.hxx"
 

Index: level_property_window.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/level_property_window.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- level_property_window.cxx   12 Aug 2002 22:52:04 -0000      1.5
+++ level_property_window.cxx   16 Aug 2002 13:03:36 -0000      1.6
@@ -17,10 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifdef WIN32
-#pragma warning(disable:4786)
-#endif
-
 #include "object_manager.hxx"
 #include "../string_converter.hxx"
 #include "level_property_window.hxx"

Index: level_property_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/level_property_window.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- level_property_window.hxx   2 Jul 2002 16:06:51 -0000       1.4
+++ level_property_window.hxx   16 Aug 2002 13:03:36 -0000      1.5
@@ -20,7 +20,11 @@
 #ifndef HEADER_PINGUS_LEVEL_PROPERTY_WINDOW_HXX
 #define HEADER_PINGUS_LEVEL_PROPERTY_WINDOW_HXX
 
-#include <ClanLib/gui.h>
+#include <ClanLib/GUI/label.h>
+#include <ClanLib/GUI/window.h>
+#include <ClanLib/GUI/checkbox.h>
+#include <ClanLib/GUI/inputbox.h>
+#include "../pingus.hxx"
 
 class ObjectManager;
 

Index: object_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- object_manager.cxx  8 Jul 2002 17:05:09 -0000       1.24
+++ object_manager.cxx  16 Aug 2002 13:03:36 -0000      1.25
@@ -30,10 +30,6 @@
 #include "object_manager.hxx"
 #include "editor_view.hxx"
 
-#ifdef WIN32
-#  define for if(0);else for
-#endif
-
 using namespace std;
 using namespace Pingus;
 using namespace Actions;

Index: panel.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/panel.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- panel.hxx   2 Jul 2002 13:36:07 -0000       1.4
+++ panel.hxx   16 Aug 2002 13:03:36 -0000      1.5
@@ -22,6 +22,7 @@
 
 #include <vector>
 #include <ClanLib/Display/Display/surface.h>
+#include "../pingus.hxx"
 
 class CL_Font;
 class Editor;

Index: property_frame.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/property_frame.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- property_frame.hxx  1 Jul 2002 09:09:31 -0000       1.2
+++ property_frame.hxx  16 Aug 2002 13:03:36 -0000      1.3
@@ -20,7 +20,10 @@
 #ifndef HEADER_PINGUS_EDITOR_PROPERTY_FRAME_HXX
 #define HEADER_PINGUS_EDITOR_PROPERTY_FRAME_HXX
 
-#include <ClanLib/gui.h>
+#include <ClanLib/GUI/frame.h>
+#include "../pingus.hxx"
+
+class CL_Component;
 
 namespace Pingus
 {

Index: property_window.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/property_window.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- property_window.cxx 3 Jul 2002 17:14:25 -0000       1.8
+++ property_window.cxx 16 Aug 2002 13:03:36 -0000      1.9
@@ -17,6 +17,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <iostream>
+#include <ClanLib/GUI/gui_manager.h>
 #include "editor.hxx"
 #include "editorobj.hxx"
 #include "property_frame.hxx"

Index: property_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/property_window.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- property_window.hxx 3 Jul 2002 17:14:25 -0000       1.4
+++ property_window.hxx 16 Aug 2002 13:03:36 -0000      1.5
@@ -20,10 +20,13 @@
 #ifndef PINGUS_EDITOR_PROPERTY_WINDOW_HXX
 #define PINGUS_EDITOR_PROPERTY_WINDOW_HXX
 
-#include <ClanLib/gui.h>
+#include <ClanLib/GUI/label.h>
+#include <ClanLib/GUI/window.h>
+#include "../pingus.hxx"
 
 class Editor;
 class EditorObj;
+class CL_Component;
 
 namespace Pingus
 {

Index: selection.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/selection.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- selection.cxx       12 Aug 2002 22:52:04 -0000      1.11
+++ selection.cxx       16 Aug 2002 13:03:36 -0000      1.12
@@ -17,10 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifdef WIN32
-#pragma warning(disable:4786)
-#endif
-
 #include <algorithm>
 #include <ClanLib/Core/Math/cl_vector.h>
 #include <ClanLib/Display/Input/keyboard.h>

Index: status_line.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/status_line.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- status_line.hxx     2 Jul 2002 13:36:07 -0000       1.6
+++ status_line.hxx     16 Aug 2002 13:03:36 -0000      1.7
@@ -21,6 +21,7 @@
 #define HEADER_PINGUS_EDITOR_STATUS_LINE_HXX
 
 #include <vector>
+#include "../pingus.hxx"
 
 class CL_Font;
 class EditorObj;

Index: string_reader.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/string_reader.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- string_reader.hxx   2 Jul 2002 13:36:07 -0000       1.3
+++ string_reader.hxx   16 Aug 2002 13:03:36 -0000      1.4
@@ -22,6 +22,7 @@
 
 #include <list>
 #include <string>
+#include "../pingus.hxx"
 
 class CL_Font;
 

Index: surface_selector.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/surface_selector.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- surface_selector.hxx        2 Jul 2002 13:36:07 -0000       1.4
+++ surface_selector.hxx        16 Aug 2002 13:03:36 -0000      1.5
@@ -23,6 +23,7 @@
 #include <string>
 #include <vector>
 #include <ClanLib/Display/Display/surface.h>
+#include "../pingus.hxx"
 
 class CL_Font;
 

Index: thumb_cache.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/thumb_cache.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- thumb_cache.hxx     2 Jul 2002 13:36:07 -0000       1.4
+++ thumb_cache.hxx     16 Aug 2002 13:03:36 -0000      1.5
@@ -21,6 +21,7 @@
 #define HEADER_PINGUS_EDITOR_THUMB_CACHE_HXX
 
 #include <string>
+#include "../pingus.hxx"
 
 class CL_Surface;