X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fbackgroundmgr.cpp;h=5e1987990bac1cd8ae120806e34e80c573367a26;hp=ee789deb155b0128914c7f259a24c42b9c8cda9e;hb=df521cfe14a9e0b47bdcd98d1f67d03acf242162;hpb=6480e936da257519dd36840862ac995ca8c374da

diff --git a/src/backgroundmgr.cpp b/src/backgroundmgr.cpp
index ee789de..5e19879 100644
--- a/src/backgroundmgr.cpp
+++ b/src/backgroundmgr.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2001 Kevin Rosenberg
 **
-**  $Id: backgroundmgr.cpp,v 1.5 2001/02/23 21:58:31 kevin Exp $
+**  $Id: backgroundmgr.cpp,v 1.8 2001/02/25 10:52:55 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -35,7 +35,7 @@
 #include "ctsim.h"
 #include "docs.h"
 #include "views.h"
-#include "threadrecon.h"
+#include "backgroundsupr.h"
 #include "backgroundmgr.h"
 
 
@@ -64,10 +64,11 @@ BackgroundManager::BackgroundManager ()
   m_sizeLabel.Set (140, 20);
   m_sizeBorder.Set (4, 4);
   m_sizeCellSpacing.Set (3, 3);
-  m_sizeButton.Set (70, 20);
+  //m_sizeButton.Set (70, 20);
+  m_sizeButton.Set (0, 0);
 
   m_sizeCell.Set (m_sizeGauge.x + m_sizeLabel.x + m_sizeCellSpacing.x + m_sizeButton.x, 25);
-  
+
   Show(false);
 }
 
@@ -130,18 +131,21 @@ BackgroundManager::OnAddTask (wxCommandEvent& event)
   wxPoint posButton (m_sizeBorder.x + m_sizeGauge.x + m_sizeLabel.x, m_sizeBorder.y + iFirstUnusedPos * m_sizeCell.y);
   wxGauge* pGauge = new wxGauge (m_pCanvas, -1, iNumUnits, posGauge, m_sizeGauge);
   wxStaticText* pLabel = new wxStaticText (m_pCanvas, -1, pszTaskName, posLabel, m_sizeLabel);
-  wxButton* pCancelButton = new wxButton (m_pCanvas, iFirstUnusedPos, _T("Cancel"), posButton, m_sizeButton, wxBU_LEFT);
+//  wxButton* pCancelButton = new wxButton (m_pCanvas, iFirstUnusedPos, _T("Cancel"), posButton, m_sizeButton, wxBU_LEFT);
 
   m_vecpBackgroundTasks.push_back (pTask);
   m_vecpGauges.push_back (pGauge);
   m_vecpNames.push_back (new std::string (pszTaskName));
   m_vecpPositions.push_back (iFirstUnusedPos);
   m_vecpLabels.push_back (pLabel);
-  m_vecpCancelButtons.push_back (pCancelButton);
+  //m_vecpCancelButtons.push_back (pCancelButton);
   m_iNumTasks++;
 
   resizeWindow();
-  Show(true);
+  if (m_iNumTasks == 1) {
+    Show(true);  
+    theApp->getMainFrame()->SetFocus();  // necessary to keep wxWindows from crashing
+  }
 }
 
 void
@@ -159,19 +163,19 @@ BackgroundManager::OnRemoveTask (wxCommandEvent& event)
   GaugeContainer::iterator iGauge = m_vecpGauges.begin();
   PositionContainer::iterator iPosition = m_vecpPositions.begin();
   LabelContainer::iterator iLabel = m_vecpLabels.begin();
-  ButtonContainer::iterator iCancelButton = m_vecpCancelButtons.begin();
+  //ButtonContainer::iterator iCancelButton = m_vecpCancelButtons.begin();
   for (TaskContainer::iterator iTask = m_vecpBackgroundTasks.begin(); iTask != m_vecpBackgroundTasks.end(); iTask++) {
     if (*iTask == pTask) {
       delete *iName;
       delete *iGauge;
       delete *iLabel;
-      delete *iCancelButton;
+      //delete *iCancelButton;
       m_vecpBackgroundTasks.erase (iTask);
       m_vecpGauges.erase (iGauge);
       m_vecpNames.erase (iName);
       m_vecpPositions.erase (iPosition);
       m_vecpLabels.erase (iLabel);
-      m_vecpCancelButtons.erase (iCancelButton);
+      //m_vecpCancelButtons.erase (iCancelButton);
       m_iNumTasks--;
       break;
     }
@@ -179,7 +183,7 @@ BackgroundManager::OnRemoveTask (wxCommandEvent& event)
     iGauge++;
     iPosition++;
     iLabel++;
-    iCancelButton++;
+    //iCancelButton++;
   }
 
   resizeWindow();
@@ -197,6 +201,8 @@ BackgroundManager::lookupGauge (BackgroundSupervisor* pTask)
 {
   wxGauge* pGauge = NULL;
   int i = 0;
+
+  wxCriticalSectionLocker locker (m_criticalSection);
   for (TaskContainer::iterator iTask = m_vecpBackgroundTasks.begin(); iTask != m_vecpBackgroundTasks.end(); iTask++) {
     if (*iTask == pTask) {
       pGauge = m_vecpGauges[i];
@@ -226,7 +232,7 @@ BackgroundManager::resizeWindow()
 
 IMPLEMENT_DYNAMIC_CLASS(BackgroundManagerCanvas, wxPanel)
 BEGIN_EVENT_TABLE(BackgroundManagerCanvas, wxPanel)
-EVT_PAINT(BackgroundManagerCanvas::OnPaint)
+//EVT_PAINT(BackgroundManagerCanvas::OnPaint)
 END_EVENT_TABLE()
 
 BackgroundManagerCanvas::BackgroundManagerCanvas (BackgroundManager* pMgr)
@@ -234,7 +240,7 @@ BackgroundManagerCanvas::BackgroundManagerCanvas (BackgroundManager* pMgr)
 {
 }
 
-
+#if 0
 void
 BackgroundManagerCanvas::OnPaint (wxPaintEvent& event)
 {
@@ -242,3 +248,4 @@ BackgroundManagerCanvas::OnPaint (wxPaintEvent& event)
 //  dc.DrawLine (0, 0, 30, 30);
 //  dc.DrawLine (30,0, 0, 30);
 }
+#endif
\ No newline at end of file