From: <mie...@us...> - 2007-06-01 00:13:24
|
Revision: 423 http://svn.sourceforge.net/oorexx/?rev=423&view=rev Author: miesfeld Date: 2007-05-31 17:13:26 -0700 (Thu, 31 May 2007) Log Message: ----------- Fix for revision 417 for ooDialog: need to check for the empty string before calling SysSearchPath. Revision Links: -------------- http://svn.sourceforge.net/oorexx/?rev=417&view=rev Modified Paths: -------------- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls Modified: interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-05-31 15:58:29 UTC (rev 422) +++ interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-06-01 00:13:26 UTC (rev 423) @@ -271,7 +271,6 @@ self~ConstDir["IDI_DLG_OOREXX"] = 4 self~ConstDir["IDI_DLG_DEFAULT"] = 2 - if arg(4, 'E') then self~ParseIncludeFile(includeFile); @@ -280,7 +279,7 @@ ::method ParseIncludeFile protected use arg hFile - if arg(1, 'O') then return 1 + if arg(1, 'O') | hFile == "" then return 1 -- Revisit. Should an error msg box be put up if the file is not found? hFile = SysSearchPath("PATH", hFile) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2007-06-24 22:13:33
|
Revision: 502 http://svn.sourceforge.net/oorexx/?rev=502&view=rev Author: miesfeld Date: 2007-06-24 15:13:36 -0700 (Sun, 24 Jun 2007) Log Message: ----------- [ 1742290 ] ooDialog - symbolic IDs not always recognized Modified Paths: -------------- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls Modified: interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-06-24 21:15:09 UTC (rev 501) +++ interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-06-24 22:13:36 UTC (rev 502) @@ -417,12 +417,21 @@ ::method ResolveSymbolicId unguarded use arg id - if self~ConstDir \= .Nil then do - id = self~ConstDir[id~space(0)~translate] - if id \= .Nil then return id - end - return -1 + id = self~ConstDir[id~space(0)~translate] + if id \= .Nil then return id; else return -1 +/** + * Return a symbolic ID from the ConstDir that matches the numeric ID. + * The docs will advise users of ooDialog to use unique numbers for all + * resources. + */ +::method ResolveNumericID unguarded + use arg numericID + if \ numericID~datatype('W') then return -1 + do symbolicID over self~ConstDir~allIndexes + if self~ConstDir[symbolicID] == numericID then return symbolicID + end + return -1 /* This method returns the handle of a dialog item */ @@ -653,8 +662,10 @@ ::method SetDataStem protected unguarded use arg dataStem. do k over dataStem. - InternDlgData.k = dataStem.k - if InternDlgData.k = "INTERNDLGDATA."k then InternDlgData.k = "" + if k~dataType('W') then numericID = k + else numericID = self~ResolveSymbolicID(k) + InternDlgData.numericID = dataStem.k + if InternDlgData.numericID = "INTERNDLGDATA."numericID then InternDlgData.numericID = "" end ret = SetStemData(self~Adm, "InternDlgData.") @@ -665,7 +676,14 @@ use arg dataStem. ret = GetStemData(self~Adm, "InternDlgData.") do k over InternDlgData. - dataStem.k = InternDlgData.k + if dataStem.~hasIndex(k) then dataStem.k = InternDlgData.k + else do + symbolicID = self~resolveNumericID(k) + if symbolicID \== -1, dataStem.~hasIndex(symbolicID) then + dataStem.symbolicID = InternDlgData.k + else + dataStem.k = InternDlgData.k + end end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2007-06-24 22:50:41
|
Revision: 503 http://svn.sourceforge.net/oorexx/?rev=503&view=rev Author: miesfeld Date: 2007-06-24 15:50:40 -0700 (Sun, 24 Jun 2007) Log Message: ----------- [ 1742290 ] ooDialog - symbolic IDs not always recognized Committed the wrong working copy, this is the correct version. Modified Paths: -------------- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls Modified: interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-06-24 22:13:36 UTC (rev 502) +++ interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-06-24 22:50:40 UTC (rev 503) @@ -676,14 +676,9 @@ use arg dataStem. ret = GetStemData(self~Adm, "InternDlgData.") do k over InternDlgData. - if dataStem.~hasIndex(k) then dataStem.k = InternDlgData.k - else do - symbolicID = self~resolveNumericID(k) - if symbolicID \== -1, dataStem.~hasIndex(symbolicID) then - dataStem.symbolicID = InternDlgData.k - else - dataStem.k = InternDlgData.k - end + dataStem.k = InternDlgData.k + symbolicID = self~resolveNumericID(k) + if symbolicID \== -1 then dataStem.symbolicID = InternDlgData.k end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2007-07-01 23:29:16
|
Revision: 541 http://svn.sourceforge.net/oorexx/?rev=541&view=rev Author: miesfeld Date: 2007-07-01 16:29:18 -0700 (Sun, 01 Jul 2007) Log Message: ----------- [ 1727172 ] ooDialog's handling of defined dialogs inconsistent Handle better the resource definition file produced by Microsoft's dialog editor. Modified Paths: -------------- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls Modified: interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-07-01 23:00:22 UTC (rev 540) +++ interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-07-01 23:29:18 UTC (rev 541) @@ -282,7 +282,7 @@ return 0 -::method ParseIncludeFile protected +::method ParseIncludeFile use arg hFile if arg(1, 'O') | hFile == "" then return 1 @@ -296,14 +296,37 @@ do while f~state == "READY" line = f~linein~strip('L') + + if line~abbrev("#ifdef") then do + self~skipThroughIfDefs(f, line) + iterate + end + if line~abbrev("#define") & line~words == 3 then do parse var line def symbol numericID . - if numericID~datatype('N') then self~ConstDir[symbol~translate] = numericID + if numericID~datatype('W') then self~ConstDir[symbol~translate] = numericID end end f~close return 0 +::method skipThroughIfDefs private + use arg fObj, line + + if \ line~abbrev("#ifdef") & \ line~abbrev("#ifndef") then return + ifDefStack = .queue~new + ifDefStack~push(line) + do while fObj~state == "READY" + l = fObj~linein~strip("L") + select + when l~abbrev("#endif") then ifDefStack~pull + when l~abbrev("#ifdef") then ifDefStack~push(l) + when l~abbrev("#ifndef") then ifDefStack~push(l) + otherwise nop + end + if ifDefStack~items == 0 then leave + end + ::method DlgHandle unguarded return self~hwnd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2007-07-09 00:32:15
|
Revision: 568 http://svn.sourceforge.net/oorexx/?rev=568&view=rev Author: miesfeld Date: 2007-07-08 17:32:12 -0700 (Sun, 08 Jul 2007) Log Message: ----------- Fix for [ 1750095 ] ooDialog - connectListXXX methods not returning a result Modified Paths: -------------- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls Modified: interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-07-08 21:04:41 UTC (rev 567) +++ interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-07-09 00:32:12 UTC (rev 568) @@ -515,7 +515,7 @@ use arg id, msgToRise if id~DataType("N") = 0 then id = self~ResolveSymbolicId(id) if id = -1 then return -1 - self~AddUserMsg(msgToRise, 0x00000111, 0xFFFFFFFF, '0x0001'||id~d2x(4), 0xFFFFFFFF, 0, 0) + return self~AddUserMsg(msgToRise, 0x00000111, 0xFFFFFFFF, '0x0001'||id~d2x(4), 0xFFFFFFFF, 0, 0) /* Connect a list left double-click with a method */ @@ -523,7 +523,7 @@ use arg id, msgToRise if id~DataType("N") = 0 then id = self~ResolveSymbolicId(id) if id = -1 then return -1 - self~AddUserMsg(msgToRise, 0x00000111, 0xFFFFFFFF, '0x0002'||id~d2x(4), 0xFFFFFFFF, 0, 0) + return self~AddUserMsg(msgToRise, 0x00000111, 0xFFFFFFFF, '0x0002'||id~d2x(4), 0xFFFFFFFF, 0, 0) /* Connect any Windows message with a class method */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2007-08-22 03:25:43
|
Revision: 696 http://oorexx.svn.sourceforge.net/oorexx/?rev=696&view=rev Author: miesfeld Date: 2007-08-21 20:25:37 -0700 (Tue, 21 Aug 2007) Log Message: ----------- Back out part of the commit for [ 1778935 ] ooDialog - ListBox selectedIndexes bug for category dialogs. For category dialogs, the getCategoryMultiList method should be used rather than the getMultiList method. Modified Paths: -------------- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls Modified: interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-08-21 20:52:54 UTC (rev 695) +++ interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-08-22 03:25:37 UTC (rev 696) @@ -966,11 +966,8 @@ /* The numbers are seperated by spaces. You can parse it using 'parse var' */ ::method GetMultiList unguarded - use arg id, category - if arg(2, 'E') & self~hasMethod('CATALOG') then - return self~InternalGetItemData(id, self~catalog['handles'][category], 4) - else - return self~InternalGetItemData(id, self~DlgHandle, 4) + use arg id + return self~InternalGetItemData(id, self~DlgHandle, 4) /* This method gets the value of a dialog item. You don't have to know */ /* what kind of item it is when it has been connected before */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2007-09-26 21:02:26
|
Revision: 817 http://oorexx.svn.sourceforge.net/oorexx/?rev=817&view=rev Author: miesfeld Date: 2007-09-26 14:02:24 -0700 (Wed, 26 Sep 2007) Log Message: ----------- [ 1803061 ] ooDialog - add the DM_REPOSITION message Modified Paths: -------------- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls Modified: interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-09-26 20:14:50 UTC (rev 816) +++ interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-09-26 21:02:24 UTC (rev 817) @@ -493,6 +493,9 @@ ::method IsMinimized unguarded return WinAPI32Func("WNDSTATE", "I", self~hwnd) +-- Send the DM_REPOSITION message to the dialog. +::method EnsureVisible unguarded + return SendWinMsg("ANY", self~DlgHandle, "0x0402", 0, 0) /* The following methods create a connection between a class method */ /* and a dialog item (dialog control). The connected method will be */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mie...@us...> - 2007-09-30 21:24:18
|
Revision: 850 http://oorexx.svn.sourceforge.net/oorexx/?rev=850&view=rev Author: miesfeld Date: 2007-09-30 14:24:21 -0700 (Sun, 30 Sep 2007) Log Message: ----------- [ 1779444 ] Enhance ooDialog for function key or hotkeys Return a value from connectHelp. Modified Paths: -------------- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls Modified: interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls =================================================================== --- interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-09-30 20:37:14 UTC (rev 849) +++ interpreter-3.x/trunk/platform/windows/oodialog/plbdlg.cls 2007-09-30 21:24:21 UTC (rev 850) @@ -510,7 +510,7 @@ -- Connect WM_HELP messages (F1) to a method. ::method ConnectHelp use strict arg msgToRise - self~addUserMsg(msgToRise, "0x00000053", "0xFFFFFFFF", 0, 0, 0, 0, 0x00000101) + return self~addUserMsg(msgToRise, "0x00000053", "0xFFFFFFFF", 0, 0, 0, 0, 0x00000101) /* The following methods create a connection between a class method */ /* and a dialog item (dialog control). The connected method will be */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |