Changeset 19240 for trunk/Mars

Timestamp:

10/20/18 21:34:48 (6 years ago)

Author:

tbretz

Message:

Allow to link the marslogo into the shared object so that no path is required.

Location:

trunk/Mars/mbase

Files:

• MGList.cc (modified) (2 diffs)
• MGList.h (modified) (1 diff)
• MStatusDisplay.cc (modified) (1 diff)

trunk/Mars/mbase/MGList.cc

@@ -39 +39 @@
 #include <TROOT.h>
 #include <TClass.h>
+#include <TImage.h>
 #include <TGClient.h>
 #include <TGWidget.h>
@@ -287 +288 @@
     return pic;
 }
+
+const TGPicture *MGList::GetPicture(const char *name, const char *xpm[])
+{
+    struct MGPicture : public TGPicture
+    {
+        MGPicture (const char *_n, Pixmap_t _p, Pixmap_t _m) : TGPicture(_n, _p, _m) { }
+    };
+
+    // Add Mars logo picture
+    TImage *img = TImage::Open(const_cast<char **>(xpm));
+    if (!img)
+        return 0;
+
+    TGPicture *pic = new MGPicture(name, img->GetPixmap(), img->GetMask());
+    delete img;
+    AddPicture(pic, name);
+
+    return pic;
+}
+
 // --------------------------------------------------------------------------
 //

trunk/Mars/mbase/MGList.h

@@ -29 +29 @@
     const TGPicture *GetPicture(const char *name);
     const TGPicture *GetPicture(const char *name, Int_t width, Int_t height);
+    const TGPicture *GetPicture(const char *name, const char *xpm[]);
 
     TObject *FindWidget(Int_t id) const;

trunk/Mars/mbase/MStatusDisplay.cc

@@ -467 +467 @@
     f->AddFrame(l, lay);
 
-    // Add Mars logo picture
-    const TGPicture *pic2 = fList->GetPicture("marslogo.xpm");
-    if (pic2)
-    {
-        TGPictureButton *mars  = new TGPictureButton(f, pic2, kPicMars);
-        fList->Add(mars);
-        mars->Associate(this);
-
-        TGLayoutHints *lay2 = new TGLayoutHints(kLHintsCenterX|kLHintsCenterY, 10, 10, 5, 5);
-        fList->Add(lay2);
-        f->AddFrame(mars, lay2);
+    {
+#define static static const
+#include "marslogo.xpm"
+#undef static
+
+        // Add Mars logo picture
+        const TGPicture *pic2 = fList->GetPicture("marslogo", marslogo);
+        if (pic2)
+        {
+            TGPictureButton *mars  = new TGPictureButton(f, pic2, kPicMars);
+            fList->Add(mars);
+            mars->Associate(this);
+
+            TGLayoutHints *lay2 = new TGLayoutHints(kLHintsCenterX|kLHintsCenterY, 10, 10, 5, 5);
+            fList->Add(lay2);
+            f->AddFrame(mars, lay2);
+        }
     }