Changeset 1108 for trunk/MagicSoft/Mars/mmain/MMars.cc

Timestamp:

12/11/01 15:22:10 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mmain/MMars.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mmain/MMars.cc

@@ -26 +26 @@
 #include "MMars.h"
 
+#include <iostream.h>
+
 #include <TApplication.h>  // gROOT->GetApplication()->...
 
@@ -35 +37 @@
 #include <TG3DLine.h>      // TGHorizontal3DLine
 
+#include "MGList.h"
 #include "MEvtDisp.h"
 #include "MAnalysis.h"
@@ -85 +88 @@
 void MMars::CreateTopFrame(TGHorizontalFrame *top)
 {
-    fPic1 = gClient->GetPicture("magiclogo.xpm");
-    fPic2 = gClient->GetPicture("marslogo.xpm");
-
-    TGPictureButton *magic = new TGPictureButton(top, fPic1, kPicMagic);
-    TGPictureButton *mars  = new TGPictureButton(top, fPic2, kPicMars);
-
-    fList->Add(magic);
-    fList->Add(mars);
-
-    magic->Associate(this);
-    mars->Associate(this);
-
-    TGLayoutHints *lay1 = new TGLayoutHints(kLHintsLeft,  10., 10., 20., 10.);
-    TGLayoutHints *lay2 = new TGLayoutHints(kLHintsRight, 10., 10., 10., 10.);
-
-    fList->Add(lay1);
-    fList->Add(lay2);
-
-    top->AddFrame(magic, lay1);
-    top->AddFrame(mars,  lay2);
+    const TGPicture *pic1 = fList->GetPicture("magiclogo.xpm");
+    if (pic1)
+    {
+        TGPictureButton *magic = new TGPictureButton(top, pic1, kPicMagic);
+        fList->Add(magic);
+        magic->Associate(this);
+        TGLayoutHints *lay1 = new TGLayoutHints(kLHintsLeft,  10., 10., 20., 10.);
+        fList->Add(lay1);
+        top->AddFrame(magic, lay1);
+    }
+
+    const TGPicture *pic2 = fList->GetPicture("marslogo.xpm");
+    if (pic2)
+    {
+        TGPictureButton *mars  = new TGPictureButton(top, pic2, kPicMars);
+        fList->Add(mars);
+        mars->Associate(this);
+        TGLayoutHints *lay2 = new TGLayoutHints(kLHintsRight, 10., 10., 10., 10.);
+        fList->Add(lay2);
+        top->AddFrame(mars,  lay2);
+    }
 }
 
@@ -176 +180 @@
     // Create the deletion list
     //
-    fList = new TList;
+    fList = new MGList;
     fList->SetOwner();
 
@@ -230 +234 @@
 MMars::~MMars()
 {
-    gClient->FreePicture(fPic1);
-    gClient->FreePicture(fPic2);
-
     delete fList;
 }