Changeset 6824

Timestamp:

03/15/05 17:52:23 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MGMenu.cc (modified) (2 diffs)
• mbase/MGMenu.h (modified) (1 diff)
• mpedestal/MExtractPedestal.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -43 +43 @@
        really obsolete
 
+   * mbase/MGMenu.[h,cc]:
+     - make fix fix also compile root 3.10.02
+
 
 
@@ -49 +52 @@
    * mbase/MGMenu.h:
      - added a fix for root 4.02.00
+
 
 

trunk/MagicSoft/Mars/mbase/MGMenu.cc

@@ -185 +185 @@
 Bool_t MGMenuBar::HandleKey(Event_t *event)
 {
+#if ROOT_VERSION_CODE < ROOT_VERSION(4,02,00)
     //
     // If this isn't a pressed key do nothing
@@ -222 +223 @@
         return kTRUE;
     }
+#endif
 
     return TGMenuBar::HandleKey(event);
 }
+
+void MGMenuBar::BindKeys(Bool_t b)
+{
+#if ROOT_VERSION_CODE >= ROOT_VERSION(4,02,00)
+    TGMenuBar::BindKeys(b);
+#endif
+}  // root>=4.02.00

trunk/MagicSoft/Mars/mbase/MGMenu.h

@@ -47 +47 @@
 
     void BindKeys(TGMainFrame *frame);                   // root<=3.10.02
-    void BindKeys(Bool_t b) { TGMenuBar::BindKeys(b); }  // root>=4.02.00
+    void BindKeys(Bool_t b);
 
     Bool_t HandleKey(Event_t *event);

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -442 +442 @@
   if (fExtractor)
   {
-    if (!fExtractor->ReInit(pList))
+    if (!((MTask*)fExtractor)->ReInit(pList))
         return kFALSE;