[Oorexx-svn] SF.net SVN: oorexx:[6532] main/trunk/extensions/platform/windows/oodialog/ Menu.cls

[<mie...@us...>]

Revision: 6532
          http://oorexx.svn.sourceforge.net/oorexx/?rev=6532&view=rev
Author:   miesfeld
Date:     2010-12-30 05:27:58 +0000 (Thu, 30 Dec 2010)

Log Message:
-----------
[3143088] Add test for MENUEX in oodialog.cls

Modified Paths:
--------------
    main/trunk/extensions/platform/windows/oodialog/Menu.cls

Modified: main/trunk/extensions/platform/windows/oodialog/Menu.cls
===================================================================
--- main/trunk/extensions/platform/windows/oodialog/Menu.cls	2010-12-29 23:42:55 UTC (rev 6531)
+++ main/trunk/extensions/platform/windows/oodialog/Menu.cls	2010-12-30 05:27:58 UTC (rev 6532)
@@ -289,11 +289,13 @@
   end
 
   found = 0; n = 0
+  isMenuEx = .false
   fl = f~lines
   do while found = 0, fl > 0
      do while n = 0, fl > 0
         s = f~linein; fl -= 1
-        n = s~wordpos("MENU")  -- TODO we could parse extended menus by looking for MENU *and* MENUEX
+        keyWord = s~word(2)
+        if keyWord == "MENU" |  keyWord == "MENUEX" then n = 2
      end
 
      if f~lines == 0 then do
@@ -312,6 +314,8 @@
      else if menuid == -1, s~word(n-1)~translate == menuName then found = 1
      else if menuid \== -1, self~resolveResourceID(s~word(n-1)) == menuid then found = 1
      else n = 0
+
+     if n \= 0, keyWord == "MENUEX" then isMenuEx = .true
   end
 
   s = f~linein; fl -= 1
@@ -360,6 +364,17 @@
     raise syntax 98.900 array (msg)
   end
 
+  if isMenuEx then return self~parseMenuEx(rcarray, arrcount, connect)
+  else return self~parseMenu(rcarray, arrcount, connect)
+
+syntax:
+  c = condition('O')
+  if c~traceBack \== .nil then c~traceBack~empty
+  raise propagate
+
+::method parseMenu private
+  use strict arg rcarray, arrcount, connect
+
   do i = 1 to arrcount
      s = rcarray[i]
 
@@ -407,8 +422,10 @@
 
   return 0
 
-syntax:
-  c = condition('O')
-  if c~traceBack \== .nil then c~traceBack~empty
-  raise propagate
+-- TODO write code to actually parse a MENUEX resource.  By accident, the code
+-- for parsing a MENU resource is adequate to produce an in-memory MENU
+-- template.  It does not produce an in-memory MENUEX template.
+::method parseMenuEx private
+  use strict arg rcarray, arrcount, connect
+  forward message 'PARSEMENU'
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.