Changeset 19291 for trunk/Mars


Ignore:
Timestamp:
10/24/18 20:04:36 (6 years ago)
Author:
tbretz
Message:
This workaround is not needed anymore.
Location:
trunk/Mars/mbase
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Mars/mbase/MGMenu.cc

    r6824 r19291  
    3030#include "MGMenu.h"
    3131
    32 
     32#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
    3333MGMenuEntry::MGMenuEntry(TGMenuEntry *ent)
    3434{
    3535    memcpy(this, ent, sizeof(*ent));
    3636}
     37#endif
    3738
    3839// -------------------------------------------------------------
    … …  
    8081            frame->BindKey(w, GetKeyCode(el), kKeyMod1Mask);
    8182            if (el->GetType()==kMenuPopup)
    82                 MGMenuEntry(el).GetPopup()->BindKeys(w, frame);
     83                static_cast<MGPopupMenu*>(MGMenuEntry(el).GetPopup())->BindKeys(w, frame);
    8384            continue;
    8485        }

  • trunk/Mars/mbase/MGMenu.h

    r6824 r19291  
    88class MGPopupMenu;
    99
     10#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
    1011class MGMenuEntry : public TGMenuEntry
    1112{
    … …  
    2425    void *GetUserData()     { return fUserData; }
    2526};
     27#else
     28#define MGMenuEntry(a) (*a)
     29#endif
    2630
    2731class MGPopupMenu : public TGPopupMenu
Note: See TracChangeset for help on using the changeset viewer.