[simspark-cvs] simspark/contrib/rsgedit mainframe.cpp, 1.8.2.9, 1.8.2.10

[Oliver O. <fr...@us...>]

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

Modified Files:
      Tag: WIN32
	mainframe.cpp 
Log Message:
- fixed a couple of implicit conversions that didn't work on Mac OS / wx 2.5.3
- SetSashGravity is supported from wx 2.5.4, so using this function is disabled for earlier versions of wx


Index: mainframe.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v
retrieving revision 1.8.2.9
retrieving revision 1.8.2.10
diff -C2 -d -r1.8.2.9 -r1.8.2.10
*** mainframe.cpp	23 Feb 2007 22:21:38 -0000	1.8.2.9
--- mainframe.cpp	28 Feb 2007 00:19:30 -0000	1.8.2.10
***************
*** 171,179 ****
  void mainframe::UpdateTitle()
  {
!     wxString title = "SimSpark";
      if (! mSimFName.empty())
!         {
!             title += " <" + mSimFName + ">";
!         }
  
      SetTitle(title);
--- 171,179 ----
  void mainframe::UpdateTitle()
  {
!     wxString title((const wxChar*)"SimSpark");
      if (! mSimFName.empty())
!     {
!         title += (const wxChar*)(" <") + mSimFName + (const wxChar*)(">");
!     }
  
      SetTitle(title);
***************
*** 184,189 ****
      mCtrHorSplitter->SplitHorizontally(mTopPane, mBottomPane);
      mCtrHorSplitter->SetSashPosition(mLastHorSashPosition);
! 
      mCtrHorSplitter->SetSashGravity(1.0);
  }
  
--- 184,190 ----
      mCtrHorSplitter->SplitHorizontally(mTopPane, mBottomPane);
      mCtrHorSplitter->SetSashPosition(mLastHorSashPosition);
! #if wxCHECK_VERSION(2,5,4)
      mCtrHorSplitter->SetSashGravity(1.0);
+ #endif
  }
  
***************
*** 192,198 ****
      mCtrVertSplitter->SplitVertically(mLeftPane, mRightPane);
      mCtrVertSplitter->SetSashPosition(mLastVertSashPosition);
! 
      // only resize right pane when window is resized
      mCtrVertSplitter->SetSashGravity(0.0);
  }
  
--- 193,200 ----
      mCtrVertSplitter->SplitVertically(mLeftPane, mRightPane);
      mCtrVertSplitter->SetSashPosition(mLastVertSashPosition);
! #if wxCHECK_VERSION(2,5,4)
      // only resize right pane when window is resized
      mCtrVertSplitter->SetSashGravity(0.0);
+ #endif
  }
  
***************
*** 617,621 ****
  
      spark->GetLog()->Normal() << "(RsgEdit) reading " << fname << "\n";
!     if (! spark->GetScriptServer()->Run(fname.c_str()))
      {
          return false;
--- 619,623 ----
  
      spark->GetLog()->Normal() << "(RsgEdit) reading " << fname << "\n";
!     if (! spark->GetScriptServer()->Run((const char*)fname.c_str()))
      {
          return false;
***************
*** 650,664 ****
  void mainframe::OnFileOpen(wxCommandEvent& event)
  {
!     wxString message = "Choose a ruby script to run";
!     wxString default_path = "./rsg";
!     wxString default_filename = "";
!     wxString default_extension = "";
!     wxString wildcard = "ruby scripts (*.rb)|*.rb";
  
      wxString filename = wxFileSelector(message, default_path, default_filename, default_extension, wildcard);
      if (filename.empty() )
!         {
!             return;
!         }
  
      OpenSimulation(filename);
--- 652,666 ----
  void mainframe::OnFileOpen(wxCommandEvent& event)
  {
!     wxString message((const wxChar*) "Choose a ruby script to run");
!     wxString default_path((const wxChar*) "./rsg");
!     wxString default_filename((const wxChar*) "");
!     wxString default_extension((const wxChar*) "");
!     wxString wildcard((const wxChar*) "ruby scripts (*.rb)|*.rb");
  
      wxString filename = wxFileSelector(message, default_path, default_filename, default_extension, wildcard);
      if (filename.empty() )
!     {
!         return;
!     }
  
      OpenSimulation(filename);
***************
*** 680,684 ****
  void mainframe::OnHelpAbout(wxCommandEvent& event)
  {
!     aboutDlg dlg(this, wxID_ANY, "About SimSpark");
      dlg.ShowModal();
  }
--- 682,686 ----
  void mainframe::OnHelpAbout(wxCommandEvent& event)
  {
!     aboutDlg dlg(this, wxID_ANY, (const wxChar*) "About SimSpark");
      dlg.ShowModal();
  }
***************
*** 686,694 ****
  void mainframe::OnAgentOpen(wxCommandEvent& event)
  {
!     wxString message = "Choose an agent executable to run";
!     wxString default_path = ".";
!     wxString default_filename = "";
!     wxString default_extension = "";
!     wxString wildcard = "agent executables (*.exe)|*.exe";
  
      wxString filename = wxFileSelector(message, default_path, default_filename, default_extension, wildcard);
--- 688,696 ----
  void mainframe::OnAgentOpen(wxCommandEvent& event)
  {
!     wxString message((const wxChar*) "Choose an agent executable to run");
!     wxString default_path((const wxChar*) ".");
!     wxString default_filename((const wxChar*) "");
!     wxString default_extension((const wxChar*) "");
!     wxString wildcard((const wxChar*) "agent executables (*.exe)|*.exe");
  
      wxString filename = wxFileSelector(message, default_path, default_filename, default_extension, wildcard);