Changeset 947 for trunk/MagicSoft/Mars/mmain/MEvtDisp.cc

Timestamp:

09/26/01 12:22:51 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mmain/MEvtDisp.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mmain/MEvtDisp.cc

@@ -39 +39 @@
 
 MEvtDisp::MEvtDisp(const TGWindow *main, const TGWindow *p,
-                                 const UInt_t w, const UInt_t h)
+                   const UInt_t w, const UInt_t h)
 : MBrowser(main, p, w, h)
 {
+    TGTextButton *fadcevt = new TGTextButton(fTop1, "FADC Disp for Events",  M_BUT_DISP1_EVT);
+    TGTextButton *fadcped = new TGTextButton(fTop1, "FADC Disp for PedEvts", M_BUT_DISP1_PED);
+    TGTextButton *fadccal = new TGTextButton(fTop1, "FADC Disp for CalEvts", M_BUT_DISP1_CAL);
 
-    fButFadcDispEvts = new TGTextButton(fTop1, "FADC Disp for Events", M_BUT_DISP1_EVT );
-    fButFadcDispEvts->Associate(this) ;
-    fTop1->AddFrame (fButFadcDispEvts, new TGLayoutHints(kLHintsTop | kLHintsLeft, 10, 10, 5, 5) );
+    fadcevt->Associate(this);
+    fadcped->Associate(this);
+    fadccal->Associate(this);
 
-    fButFadcDispPed  = new TGTextButton(fTop1, "FADC Disp for PedEvts", M_BUT_DISP1_PED );
-    fButFadcDispPed->Associate(this) ;
-    fTop1->AddFrame (fButFadcDispPed, new TGLayoutHints(kLHintsTop | kLHintsLeft, 10, 10, 5, 5) );
+    fList->Add(fadcevt);
+    fList->Add(fadcped);
+    fList->Add(fadccal);
 
-    fButFadcDispCal  = new TGTextButton(fTop1, "FADC Disp for CalEvts", M_BUT_DISP1_CAL );
-    fButFadcDispCal->Associate(this) ;
-    fTop1->AddFrame (fButFadcDispCal, new TGLayoutHints(kLHintsTop | kLHintsLeft, 10, 10, 5, 5) );
+    TGLayoutHints *laybut = new TGLayoutHints(kLHintsTop|kLHintsLeft, 10, 10, 5, 5);
+    fList->Add(laybut);
+
+    fTop1->AddFrame(fadcevt, laybut);
+    fTop1->AddFrame(fadcped, laybut);
+    fTop1->AddFrame(fadccal, laybut);
 
     MapSubwindows();
@@ -63 +69 @@
 
     MapWindow();
-} 
-
-MEvtDisp::~MEvtDisp()
-{
-    delete fButFadcDispCal; 
-    delete fButFadcDispPed; 
-    delete fButFadcDispEvts;
 } 
 
@@ -100 +99 @@
 
         case M_BUT_DISP1_PED:
-            new MGFadcDisp( fInputFile , "PedEvts",
-                            fClient->GetRoot(), this, 600, 500 ) ;
+            new MGFadcDisp(fInputFile , "PedEvts",
+                           fClient->GetRoot(), this, 600, 500);
             return kTRUE;
 
         case M_BUT_DISP1_CAL:
-            new MGFadcDisp( fInputFile , "CalEvts",
-                            fClient->GetRoot(), this, 600, 500 ) ;
+            new MGFadcDisp(fInputFile , "CalEvts",
+                           fClient->GetRoot(), this, 600, 500);
             return kTRUE;
         }