Changeset 19291

Timestamp:

10/24/18 20:04:36 (6 years ago)

Author:

tbretz

Message:

This workaround is not needed anymore.

Location:

trunk/Mars/mbase

Files:

• MGMenu.cc (modified) (2 diffs)
• MGMenu.h (modified) (2 diffs)

trunk/Mars/mbase/MGMenu.cc

@@ -30 +30 @@
 #include "MGMenu.h"
 
-
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
 MGMenuEntry::MGMenuEntry(TGMenuEntry *ent)
 {
     memcpy(this, ent, sizeof(*ent));
 }
+#endif
 
 // -------------------------------------------------------------
@@ -80 +81 @@
             frame->BindKey(w, GetKeyCode(el), kKeyMod1Mask);
             if (el->GetType()==kMenuPopup)
-                MGMenuEntry(el).GetPopup()->BindKeys(w, frame);
+                static_cast<MGPopupMenu*>(MGMenuEntry(el).GetPopup())->BindKeys(w, frame);
             continue;
         }

trunk/Mars/mbase/MGMenu.h

@@ -8 +8 @@
 class MGPopupMenu;
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
 class MGMenuEntry : public TGMenuEntry
 {
@@ -24 +25 @@
     void *GetUserData()     { return fUserData; }
 };
+#else
+#define MGMenuEntry(a) (*a)
+#endif
 
 class MGPopupMenu : public TGPopupMenu