From: <mie...@us...> - 2009-02-03 04:17:12
|
Revision: 4056 http://oorexx.svn.sourceforge.net/oorexx/?rev=4056&view=rev Author: miesfeld Date: 2009-02-03 04:17:08 +0000 (Tue, 03 Feb 2009) Log Message: ----------- All windows have the window style and extended style flags, so the getStyle / getExStyle methods should be common to all windows, not common to all dialog controls. Modified Paths: -------------- main/trunk/extensions/platform/windows/oodialog/advctrl.cls main/trunk/extensions/platform/windows/oodialog/oovother.cpp main/trunk/extensions/platform/windows/oodialog/oovutil.cpp main/trunk/extensions/platform/windows/oodialog/plbdlg.cls Modified: main/trunk/extensions/platform/windows/oodialog/advctrl.cls =================================================================== --- main/trunk/extensions/platform/windows/oodialog/advctrl.cls 2009-02-03 01:41:14 UTC (rev 4055) +++ main/trunk/extensions/platform/windows/oodialog/advctrl.cls 2009-02-03 04:17:08 UTC (rev 4056) @@ -494,9 +494,6 @@ if \ wantGroup~datatype('O')then return -3 return HandleControlEx(self~hDlg, self~id, "X", "GROUP", wantGroup) -::method GetStyleRaw -- Get the control's current GWL_STYLE style - return HandleControlEx(self~hDlg, self~id, "X", "GET") - ::method Clear parse value WindowRect("GET", self~Hwnd) with r.1 r.2 r.3 r.4 return WindowRect("CLR", self~oDlg~Adm, self~Hwnd,r.1,r.2,r.3,r.4) Modified: main/trunk/extensions/platform/windows/oodialog/oovother.cpp =================================================================== --- main/trunk/extensions/platform/windows/oodialog/oovother.cpp 2009-02-03 01:41:14 UTC (rev 4055) +++ main/trunk/extensions/platform/windows/oodialog/oovother.cpp 2009-02-03 04:17:08 UTC (rev 4056) @@ -1338,15 +1338,8 @@ CHECKARGL(4); - if ( !strcmp(argv[3].strptr, "GET") ) /* Get the window style */ + if ( !strcmp(argv[3].strptr, "TAB") ) /* Set or remove tab stop style */ { - /* Return the window style as an unsigned long for any dialog control. */ - ultoa((ULONG)lStyle, retstr->strptr, 10); - retstr->strlength = strlen(retstr->strptr); - return 0; - } - else if ( !strcmp(argv[3].strptr, "TAB") ) /* Set or remove tab stop style */ - { CHECKARGL(5); if ( argv[4].strptr[0] == '1' ) lStyle |= WS_TABSTOP; @@ -3926,6 +3919,22 @@ /** + * Methods for the .WindowBase mixin class. + */ +#define WINDOWBASE_CLASS "WindowBase" + +RexxMethod1(uint32_t, wb_getStyleRaw, OSELF, self) +{ + return GetWindowLong(rxGetWindowHandle(context, self), GWL_STYLE); +} + +RexxMethod1(uint32_t, wb_getExStyleRaw, OSELF, self) +{ + return GetWindowLong(rxGetWindowHandle(context, self), GWL_EXSTYLE); +} + + +/** * Methods for the .PlainBaseDialog class. */ #define PLAINBASEDIALOG_CLASS "PlainBaseDialog" Modified: main/trunk/extensions/platform/windows/oodialog/oovutil.cpp =================================================================== --- main/trunk/extensions/platform/windows/oodialog/oovutil.cpp 2009-02-03 01:41:14 UTC (rev 4055) +++ main/trunk/extensions/platform/windows/oodialog/oovutil.cpp 2009-02-03 04:17:08 UTC (rev 4056) @@ -2084,6 +2084,9 @@ REXX_METHOD_PROTOTYPE(dlgutil_handleToPointer_cls); REXX_METHOD_PROTOTYPE(dlgutil_test_cls); +REXX_METHOD_PROTOTYPE(wb_getStyleRaw); +REXX_METHOD_PROTOTYPE(wb_getExStyleRaw); + REXX_METHOD_PROTOTYPE(pbdlg_init_cls); REXX_METHOD_PROTOTYPE(pbdlg_setDefaultFont_cls); REXX_METHOD_PROTOTYPE(pbdlg_getFontName_cls); @@ -2233,6 +2236,9 @@ REXX_METHOD(dlgutil_getSystemMetrics_cls, dlgutil_getSystemMetrics_cls), REXX_METHOD(dlgutil_test_cls, dlgutil_test_cls), + REXX_METHOD(wb_getStyleRaw, wb_getStyleRaw), + REXX_METHOD(wb_getExStyleRaw, wb_getExStyleRaw), + REXX_METHOD(pbdlg_init_cls, pbdlg_init_cls), REXX_METHOD(pbdlg_setDefaultFont_cls, pbdlg_setDefaultFont_cls), REXX_METHOD(pbdlg_getFontName_cls, pbdlg_getFontName_cls), Modified: main/trunk/extensions/platform/windows/oodialog/plbdlg.cls =================================================================== --- main/trunk/extensions/platform/windows/oodialog/plbdlg.cls 2009-02-03 01:41:14 UTC (rev 4055) +++ main/trunk/extensions/platform/windows/oodialog/plbdlg.cls 2009-02-03 04:17:08 UTC (rev 4056) @@ -187,8 +187,11 @@ ::method GetID unguarded return Wnd_Desktop("ID", self~hwnd) -/* This method is deprecated. Use .DlgUtil directly */ -::method GetSystemMetrics unguarded +::method getStyleRaw unguarded external "LIBRARY oodialog wb_getStyleRaw" +::method getExStyleRaw unguarded external "LIBRARY oodialog wb_getExStyleRaw" + +-- DEPRECATED +::method getSystemMetrics unguarded use strict arg index return .DlgUtil~getSystemMetrics(index) @@ -1309,13 +1312,6 @@ if \ wantGroup~datatype('O')then return -3 return HandleControlEx(self~DlgHandle, id, "X", "GROUP", wantGroup) - -- Get the window style for any control (the GWL_STYLE long value) -::method GetControlStyleRaw unguarded - use strict arg id - if \ id~datatype("W") then id = self~ResolveSymbolicId(id) - if id == -1 then return -1 - return HandleControlEx(self~DlgHandle, id, "X", "GET") - ::method Center unguarded use arg showOptions if Arg(1,"o") = 1 then showOptions = ""; else showOptions = showOptions~translate This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |