Changeset 1108 for trunk/MagicSoft/Mars/mmain

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MBrowser.cc (modified) (2 diffs)
• MMars.cc (modified) (5 diffs)
• MMars.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mmain/MBrowser.cc

@@ -113 +113 @@
 {
     //
-    // Create Dir-Listbox and buttons in first frame
-    //
-    TGFSComboBox *dir = new TGFSComboBox(frame, kCBDirectory);
-    dir->SetHeight(fEntry->GetHeight());
-
-    //
-    // Get the three picturs from the system (must be deleted by FreePicture)
-    //
-    const TGPicture *pic1 = fList->GetPicture("tb_uplevel.xpm");
-    const TGPicture *pic2 = fList->GetPicture("tb_list.xpm");
-    const TGPicture *pic3 = fList->GetPicture("tb_details.xpm");
-
-    //
-    // Create the corresponding picture buttons
-    //
-    TGPictureButton *cdup   = new TGPictureButton(frame, pic1, kButDirUp);
-    TGPictureButton *list   = new TGPictureButton(frame, pic2, kButListMode);
-    TGPictureButton *detail = new TGPictureButton(frame, pic3, kButDetailMode);
-
-    //
-    // setup the buttons
-    //
-    cdup  ->SetToolTipText("One Level up!");
-    list  ->SetToolTipText("List Mode");
-    detail->SetToolTipText("Details Mode");
-
-    list  ->SetState(kButtonUp);
-    detail->SetState(kButtonEngaged);
-
-    list  ->AllowStayDown(kTRUE);
-    detail->AllowStayDown(kTRUE);
-
-    //
-    // send messages to 'this' object
-    //
-    dir   ->Associate(this);
-    cdup  ->Associate(this);
-    detail->Associate(this);
-    list  ->Associate(this);
-
-    //
-    // Add to list for 'automatic' deletion
-    //
-    fList->Add(dir);
-    fList->Add(cdup);
-    fList->Add(list);
-    fList->Add(detail);
-
-    //
     // Layout Dir-Listbox and buttons in one row (frame)
     //
@@ -169 +120 @@
     //
     TGLayoutHints *laydir = new TGLayoutHints(kLHintsExpandX|kLHintsLeft|kLHintsCenterY); //, 5, 5, 5, 5);
+    TGLayoutHints *layout = new TGLayoutHints(kLHintsRight|kLHintsCenterY, 10); //, 5, 5, 5);
+
     fList->Add(laydir);
-
-    TGLayoutHints *layout = new TGLayoutHints(kLHintsRight|kLHintsCenterY, 10); //, 5, 5, 5);
     fList->Add(layout);
 
-    frame->AddFrame(dir,    laydir);
-    frame->AddFrame(list,   layout);
-    frame->AddFrame(detail, layout);
-    frame->AddFrame(cdup,   layout);
+    //
+    // Create Dir-Listbox and buttons in first frame
+    //
+    TGFSComboBox *dir = new TGFSComboBox(frame, kCBDirectory);
+    dir->SetHeight(fEntry->GetHeight());
+    dir->Associate(this);
+    fList->Add(dir);
+    frame->AddFrame(dir, laydir);
+
+    //
+    // Get the three picturs from the system (must be deleted by FreePicture)
+    //
+    const TGPicture *pic1 = fList->GetPicture("tb_list.xpm");
+    if (pic1)
+    {
+        TGPictureButton *list = new TGPictureButton(frame, pic1, kButListMode);
+        list->SetToolTipText("List Mode");
+        list->SetState(kButtonUp);
+        list->AllowStayDown(kTRUE);
+        list->Associate(this);
+        fList->Add(list);
+        frame->AddFrame(list, layout);
+    }
+
+    const TGPicture *pic2 = fList->GetPicture("tb_details.xpm");
+    if (pic2)
+    {
+        TGPictureButton *detail = new TGPictureButton(frame, pic2, kButDetailMode);
+        detail->SetToolTipText("Details Mode");
+        detail->SetState(kButtonEngaged);
+        detail->AllowStayDown(kTRUE);
+        detail->Associate(this);
+        fList->Add(detail);
+        frame->AddFrame(detail, layout);
+    }
+
+    const TGPicture *pic3 = fList->GetPicture("tb_uplevel.xpm");
+    if (pic3)
+    {
+        TGPictureButton *cdup = new TGPictureButton(frame, pic3, kButDirUp);
+        cdup->SetToolTipText("One Level up!");
+        cdup->Associate(this);
+        fList->Add(cdup);
+        frame->AddFrame(cdup, layout);
+    }
 }
 

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;
 }  

trunk/MagicSoft/Mars/mmain/MMars.h

@@ -10 +10 @@
 #endif
 
-class TList;
+class MGList;
 class TGVerticalFrame;
 class TGLayoutHints;
@@ -18 +18 @@
 private:
 
-    TList *fList;
-
-    const TGPicture *fPic1;
-    const TGPicture *fPic2;
+    MGList *fList;
 
     void CreateTextButton(TGVerticalFrame *tab, const char *text,