[Igarden-commit] Garden/source/Document CPlanPanel.h, 1.12.2.5, 1.12.2.6 CGardenForm.cpp, 1.4.2.12, 1.4.2.13 CGardenPanel.h, 1.8.2.6, 1.8.2.7 CPlanPanel.cpp, 1.4.2.9, 1.4.2.10

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/Garden/source/Document
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6004/source/Document

Modified Files:
      Tag: Release_branch_v1
	CPlanPanel.h CGardenForm.cpp CGardenPanel.h CPlanPanel.cpp 
Log Message:
Close child windows before doing document save, so that the save dialog is attached to the correct window.

Index: CPlanPanel.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/CPlanPanel.h,v
retrieving revision 1.12.2.5
retrieving revision 1.12.2.6
diff -C2 -d -r1.12.2.5 -r1.12.2.6
*** CPlanPanel.h	17 Apr 2008 10:44:21 -0000	1.12.2.5
--- CPlanPanel.h	14 May 2008 13:08:31 -0000	1.12.2.6
***************
*** 109,112 ****
--- 109,113 ----
  		virtual void			ScrollWheelMoved(wheelAxis_t axis, sint32 offset);
  		virtual bool			SetupContextMenu(RGContextMenu *menu);
+ 		virtual void			CloseSubWindows();
  		
  		static XGWindow			*gToolPalleteWindow;

Index: CPlanPanel.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/CPlanPanel.cpp,v
retrieving revision 1.4.2.9
retrieving revision 1.4.2.10
diff -C2 -d -r1.4.2.9 -r1.4.2.10
*** CPlanPanel.cpp	17 Apr 2008 10:44:23 -0000	1.4.2.9
--- CPlanPanel.cpp	14 May 2008 13:08:31 -0000	1.4.2.10
***************
*** 1241,1242 ****
--- 1241,1246 ----
  }
  
+ void CPlanPanel::CloseSubWindows()
+ {
+ 	ClearAlternativePalette();
+ }

Index: CGardenForm.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/CGardenForm.cpp,v
retrieving revision 1.4.2.12
retrieving revision 1.4.2.13
diff -C2 -d -r1.4.2.12 -r1.4.2.13
*** CGardenForm.cpp	10 May 2008 02:52:20 -0000	1.4.2.12
--- CGardenForm.cpp	14 May 2008 13:08:31 -0000	1.4.2.13
***************
*** 764,767 ****
--- 764,768 ----
  			
  		case KXGFileSave:
+ 			(_panels[_currentPanel])->CloseSubWindows();
  			_file->DoDocumentSave();		// Only called when passing events down from palettes
  			return 0;

Index: CGardenPanel.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/CGardenPanel.h,v
retrieving revision 1.8.2.6
retrieving revision 1.8.2.7
diff -C2 -d -r1.8.2.6 -r1.8.2.7
*** CGardenPanel.h	10 May 2008 02:52:20 -0000	1.8.2.6
--- CGardenPanel.h	14 May 2008 13:08:31 -0000	1.8.2.7
***************
*** 120,123 ****
--- 120,125 ----
  		virtual void		ScrollWheelMoved(wheelAxis_t axis, sint32 offset);
  		virtual bool		SetupContextMenu(RGContextMenu *menu) { return false; }
+ 		virtual void		CloseSubWindows() {}
+ 	
  	protected:
  		// methods