Changeset 2205 for trunk/MagicSoft

Timestamp:

06/20/03 14:34:39 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• meventdisp/MGEvtDisplay.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -5 +5 @@
    * mgui/MCamDisplay.[h,cc]:
      - fixed color palette when loading MCamDisplay
+
+   * mevtdisp/MGEvtDisplay.cc:
+     - fixed a bug in ProcessMessage, 'Exit' still doesn't work.
 
 

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

@@ -642 +642 @@
 Bool_t MGEvtDisplay::ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2)
 {
-    if (GET_MSG(msg)!=kC_TEXTENTRY && GET_MSG(msg)!=kC_COMMAND)
-        return kTRUE;
-
-    switch(GET_SUBMSG(msg))
+    switch (GET_MSG(msg))
     {
-    case kTE_ENTER:
-    case kCM_BUTTON:
-        if (parm1==kClose)
-        {
-            CloseWindow();
-            return kTRUE;
-        }
-
-        if (!fInitOk)
-            return kTRUE;
-
+    case kC_TEXTENTRY:
         switch(GET_SUBMSG(msg))
         {
         case kTE_ENTER:
-            if (GetReader()->SetEventNum(atoi(fTxtEvtNr->GetText())-1))
-                ReadinEvent();
-            return kTRUE;
-
         case kCM_BUTTON:
-            switch (parm1)
+            if (parm1==kClose)
             {
-            case kEvtPrev:
-                ReadinEvent(-1);
-                return kTRUE;
-
-            case kEvtNext:
-                ReadinEvent(+1);
+                CloseWindow();
+                return kTRUE;
+            }
+
+            if (!fInitOk)
+                return kTRUE;
+
+            switch(GET_SUBMSG(msg))
+            {
+            case kTE_ENTER:
+                if (GetReader()->SetEventNum(atoi(fTxtEvtNr->GetText())-1))
+                    ReadinEvent();
+                return kTRUE;
+
+            case kCM_BUTTON:
+                switch (parm1)
+                {
+                case kEvtPrev:
+                    ReadinEvent(-1);
+                    return kTRUE;
+
+                case kEvtNext:
+                    ReadinEvent(+1);
+                    return kTRUE;
+                }
                 return kTRUE;
             }
@@ -680 +682 @@
         return kTRUE;
 
-    case kCM_MENU:
-        switch (parm1)
+    case kC_COMMAND:
+        switch (GET_SUBMSG(msg))
+        {
+        case kCM_MENU:
+            switch (parm1)
             {
             case kFileSaveAs:
@@ -709 +714 @@
                 return kTRUE;
             }
+            return kTRUE;
+        }
         return kTRUE;
     }