[simspark-cvs] simspark/contrib/rsgedit mainframe.cpp, 1.21.2.7, 1.21.2.8 mainframe.h, 1.15.2.3, 1.15.2.4

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/rsgedit
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25990

Modified Files:
      Tag: RSGEDIT_SCINTILLA
	mainframe.cpp mainframe.h 
Log Message:
- removed member mSimFName
- entierly depend on SparkEdit class to track current start script

Index: mainframe.h
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.h,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -C2 -d -r1.15.2.3 -r1.15.2.4
*** mainframe.h	21 Jun 2007 19:18:48 -0000	1.15.2.3
--- mainframe.h	23 Jun 2007 09:24:06 -0000	1.15.2.4
***************
*** 222,230 ****
      int mLastVertSashPosition;
  
-     /** the filename of the current simulation (i.e. the corresponding
-         startup .rb script)
-     */
-     wxString mSimFName;
- 
      SparkGLCanvas* mCanvas;
  
--- 222,225 ----

Index: mainframe.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v
retrieving revision 1.21.2.7
retrieving revision 1.21.2.8
diff -C2 -d -r1.21.2.7 -r1.21.2.8
*** mainframe.cpp	23 Jun 2007 09:12:57 -0000	1.21.2.7
--- mainframe.cpp	23 Jun 2007 09:24:06 -0000	1.21.2.8
***************
*** 245,251 ****
  {
      wxString title(wxT("SimSpark"));
!     if (! mSimFName.empty())
      {
!         title += wxT(" <") + mSimFName + wxT(">");
      }
  
--- 245,253 ----
  {
      wxString title(wxT("SimSpark"));
! 
!     wxString simFName = SparkEdit::GetStartScriptFile();
!     if (! simFName.empty())
      {
!         title += wxT(" <") + simFName + wxT(">");
      }
  
***************
*** 926,933 ****
  
      DoneSimulation(sim);
- 
-     mSimFName = fname;
      UpdateTitle();
      PrintSimState();
      return true;
  }
--- 928,934 ----
  
      DoneSimulation(sim);
      UpdateTitle();
      PrintSimState();
+ 
      return true;
  }
***************
*** 971,975 ****
      event.Enable(
                   (GetSimState() == S_PAUSED) &&
!                  (! mSimFName.empty())
                   );
  }
--- 972,976 ----
      event.Enable(
                   (GetSimState() == S_PAUSED) &&
!                  (SparkEdit::GetStartScript() != 0)
                   );
  }
***************
*** 977,981 ****
  void mainframe::OnFileReload(wxCommandEvent& event)
  {
!     OpenSimulation(mSimFName);
  }
  
--- 978,986 ----
  void mainframe::OnFileReload(wxCommandEvent& event)
  {
!     wxString simName = SparkEdit::GetStartScriptFile();
!     if (! simName.IsEmpty())
!     {
!         OpenSimulation(simName);
!     }
  }
  
***************
*** 1150,1152 ****
      event.Skip();
  }
- 
--- 1155,1156 ----