[Pingus-CVS] CVS: Games/Pingus/src/editorobjs bumper_obj.hxx,1.8,1.9 conveyor_belt_obj.hxx,1.5,1.6 entrance_obj.cxx,1.2,1.3 entrance_obj.hxx,1.1,1.2 exit_obj.hxx,1.1,1.2 fake_exit_obj.hxx,1.9,1.10 groundpiece_obj.cxx,1.5,1.6 groundpiece_obj.hxx,1.2,1.3 guillotine_obj.hxx,1.8,1.9 hammer_obj.hxx,1.8,1.9 hotspot_obj.hxx,1.3,1.4 ice_block_obj.hxx,1.4,1.5 info_box_obj.hxx,1.5,1.6 laser_exit_obj.hxx,1.8,1.9 liquid_obj.hxx,1.3,1.4 smasher_obj.hxx,1.9,1.10 solid_color_background_obj.hxx,1.4,1.5 spike_obj.hxx,1.8,1.9 starfield_background_obj.hxx,1.4,1.5 surface_background_obj.hxx,1.3,1.4 switch_door_obj.hxx,1.6,1.7 switch_door_switch_obj.hxx,1.3,1.4 teleporter_obj.hxx,1.8,1.9 teleporter_target_obj.hxx,1.3,1.4 thunderstorm_background_obj.hxx,1.3,1.4

[grumbel]

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

Modified Files:
        bumper_obj.hxx conveyor_belt_obj.hxx entrance_obj.cxx 
        entrance_obj.hxx exit_obj.hxx fake_exit_obj.hxx 
        groundpiece_obj.cxx groundpiece_obj.hxx guillotine_obj.hxx 
        hammer_obj.hxx hotspot_obj.hxx ice_block_obj.hxx 
        info_box_obj.hxx laser_exit_obj.hxx liquid_obj.hxx 
        smasher_obj.hxx solid_color_background_obj.hxx spike_obj.hxx 
        starfield_background_obj.hxx surface_background_obj.hxx 
        switch_door_obj.hxx switch_door_switch_obj.hxx 
        teleporter_obj.hxx teleporter_target_obj.hxx 
        thunderstorm_background_obj.hxx 
Log Message:
- fixed GUI dialogs


Index: bumper_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/bumper_obj.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bumper_obj.hxx      28 Sep 2002 11:52:24 -0000      1.8
+++ bumper_obj.hxx      28 Nov 2002 20:09:54 -0000      1.9
@@ -46,7 +46,7 @@
   void draw (EditorNS::EditorView* view);
   
   std::string status_line ();
-
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:
   BumperObj (const BumperObj&);
   BumperObj& operator= (const BumperObj&);

Index: conveyor_belt_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/conveyor_belt_obj.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- conveyor_belt_obj.hxx       28 Sep 2002 11:52:24 -0000      1.5
+++ conveyor_belt_obj.hxx       28 Nov 2002 20:09:54 -0000      1.6
@@ -67,7 +67,8 @@
 
   void make_larger ();
   void make_smaller ();
-  
+
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   ConveyorBeltObj (const ConveyorBeltObj&);
   ConveyorBeltObj& operator= (const ConveyorBeltObj&);

Index: entrance_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/entrance_obj.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- entrance_obj.cxx    28 Sep 2002 11:52:24 -0000      1.2
+++ entrance_obj.cxx    28 Nov 2002 20:09:54 -0000      1.3
@@ -21,6 +21,8 @@
 #include <iostream>
 #include "../pingus_error.hxx"
 #include "../editor/entrance_window.hxx"
+#include "../editor/editor.hxx"
+#include "../editor/property_window.hxx"
 #include "entrance_obj.hxx"
 
 namespace EditorObjs {
@@ -105,9 +107,9 @@
 }
 
 EditorNS::PropertyFrame*
-EntranceObj::get_gui_dialog (CL_Component* parent)
+EntranceObj::get_gui_dialog (EditorNS::Editor* parent)
 {
-  return new EditorNS::EntranceWindow(parent, this);
+  return new 
EditorNS::EntranceWindow(parent->get_property_window()->get_client_area(), 
this);
 }
 
 } // namespace EditorObjs

Index: entrance_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/entrance_obj.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- entrance_obj.hxx    27 Sep 2002 11:26:46 -0000      1.1
+++ entrance_obj.hxx    28 Nov 2002 20:09:54 -0000      1.2
@@ -43,7 +43,7 @@
   
   std::string status_line ();
   
-  EditorNS::PropertyFrame* get_gui_dialog (CL_Component* parent);
+  EditorNS::PropertyFrame* get_gui_dialog (EditorNS::Editor* parent);
   
 private:
   EntranceObj (const EntranceObj&);

Index: exit_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/exit_obj.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exit_obj.hxx        27 Sep 2002 16:01:55 -0000      1.1
+++ exit_obj.hxx        28 Nov 2002 20:09:54 -0000      1.2
@@ -42,7 +42,7 @@
   void write_xml (std::ostream& xml);
   
   std::string status_line ();
-  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   ExitObj (const ExitObj&);
   ExitObj& operator= (const ExitObj&);

Index: fake_exit_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/fake_exit_obj.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fake_exit_obj.hxx   28 Sep 2002 11:52:24 -0000      1.9
+++ fake_exit_obj.hxx   28 Nov 2002 20:09:54 -0000      1.10
@@ -46,7 +46,7 @@
   void draw (EditorNS::EditorView* view);
     
   std::string status_line ();
-  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   FakeExitObj (const FakeExitObj&);
   FakeExitObj& operator= (const FakeExitObj&);

Index: groundpiece_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/groundpiece_obj.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- groundpiece_obj.cxx 27 Nov 2002 20:05:42 -0000      1.5
+++ groundpiece_obj.cxx 28 Nov 2002 20:09:54 -0000      1.6
@@ -22,6 +22,8 @@
 #include "../editor/groundpiece_window.hxx"
 #include "../worldobjsdata/groundpiece_data.hxx"
 #include "../pingus_resource.hxx"
+#include "../editor/property_window.hxx"
+#include "../editor/editor.hxx"
 #include "groundpiece_obj.hxx"
 
 namespace EditorObjs {
@@ -117,9 +119,9 @@
 }
 
 EditorNS::PropertyFrame*
-GroundpieceObj::get_gui_dialog (CL_Component* parent)
+GroundpieceObj::get_gui_dialog (EditorNS::Editor* parent)
 {
-  return new EditorNS::GroundpieceWindow(parent, this);
+  return new 
EditorNS::GroundpieceWindow(parent->get_property_window()->get_client_area(), 
this);
 }
 
 } // namespace EditorObjs

Index: groundpiece_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/groundpiece_obj.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- groundpiece_obj.hxx 27 Sep 2002 18:36:40 -0000      1.2
+++ groundpiece_obj.hxx 28 Nov 2002 20:09:54 -0000      1.3
@@ -57,7 +57,7 @@
   EditorObj* duplicate ();
   std::string status_line ();
 
-  EditorNS::PropertyFrame* get_gui_dialog (CL_Component* parent);
+  EditorNS::PropertyFrame* get_gui_dialog (EditorNS::Editor* parent);
   
 private:
   GroundpieceObj (const GroundpieceObj&);

Index: guillotine_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/guillotine_obj.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- guillotine_obj.hxx  28 Sep 2002 11:52:24 -0000      1.8
+++ guillotine_obj.hxx  28 Nov 2002 20:09:54 -0000      1.9
@@ -46,7 +46,7 @@
   void draw (EditorNS::EditorView* view);
     
   std::string status_line ();
-  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   GuillotineObj (const GuillotineObj&);
   GuillotineObj& operator= (const GuillotineObj&);

Index: hammer_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/hammer_obj.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- hammer_obj.hxx      28 Sep 2002 11:52:24 -0000      1.8
+++ hammer_obj.hxx      28 Nov 2002 20:09:54 -0000      1.9
@@ -46,7 +46,7 @@
   void draw (EditorNS::EditorView* view);
     
   std::string status_line ();
-  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   HammerObj (const HammerObj&);
   HammerObj& operator= (const HammerObj&);

Index: hotspot_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/hotspot_obj.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hotspot_obj.hxx     27 Sep 2002 18:36:40 -0000      1.3
+++ hotspot_obj.hxx     28 Nov 2002 20:09:54 -0000      1.4
@@ -20,6 +20,7 @@
 #ifndef HEADER_PINGUS_EDITOR_HOTSPOT_HXX
 #define HEADER_PINGUS_EDITOR_HOTSPOT_HXX
 
+#include "../editor/editor.hxx"
 #include "../editor/sprite_editorobj.hxx" 
 
 namespace WorldObjsData {
@@ -41,7 +42,7 @@
   EditorObj* duplicate ();
 
   std::string status_line ();
-
+  EditorNS::PropertyFrame* get_gui_dialog (EditorNS::Editor* parent) { return 
0; }
 private:
   HotspotObj (const HotspotObj&);
   HotspotObj& operator= (const HotspotObj&);

Index: ice_block_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/ice_block_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ice_block_obj.hxx   28 Sep 2002 11:52:25 -0000      1.4
+++ ice_block_obj.hxx   28 Nov 2002 20:09:54 -0000      1.5
@@ -44,7 +44,7 @@
   
   EditorObj* duplicate ();
   std::string status_line ();
-  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   IceBlockObj (const IceBlockObj&);
   IceBlockObj& operator= (const IceBlockObj&);

Index: info_box_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/info_box_obj.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- info_box_obj.hxx    28 Sep 2002 11:52:25 -0000      1.5
+++ info_box_obj.hxx    28 Nov 2002 20:09:54 -0000      1.6
@@ -42,7 +42,7 @@
   void write_xml (std::ostream& xml);
   EditorObj* duplicate ();
   std::string status_line ();
-  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   InfoBoxObj (const InfoBoxObj&);
   InfoBoxObj& operator= (const InfoBoxObj&);

Index: laser_exit_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/laser_exit_obj.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- laser_exit_obj.hxx  28 Sep 2002 11:52:25 -0000      1.8
+++ laser_exit_obj.hxx  28 Nov 2002 20:09:54 -0000      1.9
@@ -47,7 +47,7 @@
   void draw (EditorNS::EditorView* view);
     
   std::string status_line ();
-  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   LaserExitObj (const LaserExitObj&);
   LaserExitObj& operator= (const LaserExitObj&);

Index: liquid_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/liquid_obj.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- liquid_obj.hxx      27 Sep 2002 18:36:40 -0000      1.3
+++ liquid_obj.hxx      28 Nov 2002 20:09:54 -0000      1.4
@@ -51,7 +51,7 @@
 
   void make_larger  ();
   void make_smaller ();
-  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   LiquidObj (const LiquidObj&);
   LiquidObj& operator= (const LiquidObj&);

Index: smasher_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/smasher_obj.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- smasher_obj.hxx     28 Sep 2002 11:52:25 -0000      1.9
+++ smasher_obj.hxx     28 Nov 2002 20:09:54 -0000      1.10
@@ -46,7 +46,7 @@
   void draw (EditorNS::EditorView* view);
     
   std::string status_line ();
-  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   SmasherObj (const SmasherObj&);
   SmasherObj& operator= (const SmasherObj&);

Index: solid_color_background_obj.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editorobjs/solid_color_background_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- solid_color_background_obj.hxx      28 Sep 2002 11:52:25 -0000      1.4
+++ solid_color_background_obj.hxx      28 Nov 2002 20:09:54 -0000      1.5
@@ -56,7 +56,7 @@
   void set_position_offset (const Vector& offset);  
 
   std::string status_line ();
-        
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }     
 
 private:
   SolidColorBackgroundObj (const SolidColorBackgroundObj&);
   SolidColorBackgroundObj& operator= (const SolidColorBackgroundObj&);

Index: spike_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/spike_obj.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- spike_obj.hxx       28 Sep 2002 11:52:25 -0000      1.8
+++ spike_obj.hxx       28 Nov 2002 20:09:54 -0000      1.9
@@ -46,7 +46,7 @@
   void draw (EditorNS::EditorView* view);
     
   std::string status_line ();
-  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   SpikeObj (const SpikeObj&);
   SpikeObj& operator= (const SpikeObj&);

Index: starfield_background_obj.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editorobjs/starfield_background_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- starfield_background_obj.hxx        28 Sep 2002 11:52:25 -0000      1.4
+++ starfield_background_obj.hxx        28 Nov 2002 20:09:54 -0000      1.5
@@ -45,7 +45,7 @@
   EditorObj* duplicate ();
 
   std::string status_line ();
-  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   StarfieldBackgroundObj (const StarfieldBackgroundObj&);
   StarfieldBackgroundObj& operator= (const StarfieldBackgroundObj&);

Index: surface_background_obj.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editorobjs/surface_background_obj.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- surface_background_obj.hxx  27 Sep 2002 18:36:40 -0000      1.3
+++ surface_background_obj.hxx  28 Nov 2002 20:09:54 -0000      1.4
@@ -42,7 +42,7 @@
   EditorObj* duplicate ();
 
   std::string status_line ();
-  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   SurfaceBackgroundObj (const SurfaceBackgroundObj&);
   SurfaceBackgroundObj& operator= (const SurfaceBackgroundObj&);

Index: switch_door_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/switch_door_obj.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- switch_door_obj.hxx 28 Sep 2002 11:52:25 -0000      1.6
+++ switch_door_obj.hxx 28 Nov 2002 20:09:54 -0000      1.7
@@ -64,7 +64,8 @@
   void draw (EditorNS::EditorView* view);
   void save_xml (std::ostream& xml);
   std::string status_line ();
-  
+
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:
   SwitchDoorObj (const SwitchDoorObj&);
   SwitchDoorObj& operator= (const SwitchDoorObj&);

Index: switch_door_switch_obj.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editorobjs/switch_door_switch_obj.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- switch_door_switch_obj.hxx  27 Sep 2002 11:26:46 -0000      1.3
+++ switch_door_switch_obj.hxx  28 Nov 2002 20:09:54 -0000      1.4
@@ -40,7 +40,8 @@
 
   void write_xml (std::ostream&) {}
   std::string status_line ();
-  
+
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   SwitchDoorSwitchObj (const SwitchDoorSwitchObj&);
   SwitchDoorSwitchObj& operator= (const SwitchDoorSwitchObj&);

Index: teleporter_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/teleporter_obj.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- teleporter_obj.hxx  28 Sep 2002 11:52:25 -0000      1.8
+++ teleporter_obj.hxx  28 Nov 2002 20:09:54 -0000      1.9
@@ -56,7 +56,7 @@
 
   void draw (EditorNS::EditorView * view);
   std::string status_line ();
-
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:
   TeleporterObj (const TeleporterObj&);
   TeleporterObj& operator= (const TeleporterObj&);

Index: teleporter_target_obj.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editorobjs/teleporter_target_obj.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- teleporter_target_obj.hxx   27 Sep 2002 11:26:46 -0000      1.3
+++ teleporter_target_obj.hxx   28 Nov 2002 20:09:54 -0000      1.4
@@ -44,7 +44,7 @@
   /// The saving will be done in EditorTeleporterObj::write_xml
   void write_xml (std::ostream&) { }
   std::string status_line ();
-
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:
   TeleporterTargetObj (const TeleporterTargetObj&);
   TeleporterTargetObj& operator= (const TeleporterTargetObj&);

Index: thunderstorm_background_obj.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editorobjs/thunderstorm_background_obj.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- thunderstorm_background_obj.hxx     27 Sep 2002 18:36:40 -0000      1.3
+++ thunderstorm_background_obj.hxx     28 Nov 2002 20:09:54 -0000      1.4
@@ -42,7 +42,7 @@
   EditorObj* duplicate ();
   
   std::string status_line ();
-  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   ThunderstormBackgroundObj (const ThunderstormBackgroundObj&);
   ThunderstormBackgroundObj& operator= (const ThunderstormBackgroundObj&);