From: <mie...@us...> - 2010-03-12 01:55:24
|
Revision: 5690 http://oorexx.svn.sourceforge.net/oorexx/?rev=5690&view=rev Author: miesfeld Date: 2010-03-12 01:55:17 +0000 (Fri, 12 Mar 2010) Log Message: ----------- ooDialog - consistency updates found while working on doc Modified Paths: -------------- main/trunk/extensions/platform/windows/oodialog/DialogControls.cls main/trunk/extensions/platform/windows/oodialog/PlainBaseDialog.cls main/trunk/extensions/platform/windows/oodialog/oodControl.cpp main/trunk/extensions/platform/windows/oodialog/oodPackageEntry.cpp Modified: main/trunk/extensions/platform/windows/oodialog/DialogControls.cls =================================================================== --- main/trunk/extensions/platform/windows/oodialog/DialogControls.cls 2010-03-12 01:51:57 UTC (rev 5689) +++ main/trunk/extensions/platform/windows/oodialog/DialogControls.cls 2010-03-12 01:55:17 UTC (rev 5690) @@ -89,8 +89,8 @@ ::method clearRect unguarded external "LIBRARY oodialog dlgctrl_clearRect" ::method setColor external "LIBRARY oodialog dlgctrl_setColor" ::method setSysColor external "LIBRARY oodialog dlgctrl_setColor" -::method value unguarded external "LIBRARY oodialog dlgctrl_value" -::method "value=" unguarded external "LIBRARY oodialog dlgctrl_valueEquals" +::method data unguarded external "LIBRARY oodialog dlgctrl_data" +::method "data=" unguarded external "LIBRARY oodialog dlgctrl_dataEquals" ::method getMouseCapture forward to (self~oDlg) @@ -108,16 +108,19 @@ ::method hasKeyPressConnection unguarded external "LIBRARY oodialog dlgctrl_hasKeyPressConnection" ::method getTextSizeDlg unguarded external "LIBRARY oodialog dlgctrl_getTextSizeDlg" --- DEPRECATED +-- DEPRECATED START ::method processMessage forward message "sendMessage" --- DEPRECATED ::method getTextSize unguarded forward message "getTextSizeDlg" continue return result~width result~height +::method value unguarded external "LIBRARY oodialog dlgctrl_data" +::method "value=" unguarded external "LIBRARY oodialog dlgctrl_dataEquals" +-- DEPRECATED END + ::class 'StaticControl' subclass DialogControl public ::method getIcon external "LIBRARY oodialog stc_getIcon" Modified: main/trunk/extensions/platform/windows/oodialog/PlainBaseDialog.cls =================================================================== --- main/trunk/extensions/platform/windows/oodialog/PlainBaseDialog.cls 2010-03-12 01:51:57 UTC (rev 5689) +++ main/trunk/extensions/platform/windows/oodialog/PlainBaseDialog.cls 2010-03-12 01:55:17 UTC (rev 5690) @@ -540,6 +540,7 @@ ::method connectMonthCalendar unguarded external "LIBRARY oodialog pbdlg_connect_ControName" ::method connectSeparator unguarded external "LIBRARY oodialog pbdlg_connect_ControName" +-- Internal use only, do not document. ::method addAttribute private use arg id, attributeName if arg(2,'o') = 1 then attributeName = "DATA"id~space(0) Modified: main/trunk/extensions/platform/windows/oodialog/oodControl.cpp =================================================================== --- main/trunk/extensions/platform/windows/oodialog/oodControl.cpp 2010-03-12 01:51:57 UTC (rev 5689) +++ main/trunk/extensions/platform/windows/oodialog/oodControl.cpp 2010-03-12 01:55:17 UTC (rev 5690) @@ -1119,44 +1119,45 @@ (argumentOmitted(2) ? -1 : fgColor), (method[3] == 'S')); } -/** DialogControl::value() +/** DialogControl::data() * - * Gets the "value" of the dialog control. + * Gets the "data" of the dialog control. * - * @return The 'value' or 'data' of the control. + * @return The 'data' of the control. * * @remarks The original ooDialog code used the abstraction that there were * only two objects involved. The ooDialog object and the underlying * Windows dialog. The dialog controls were considered to be the * 'data' of the underlying Windows dialog. In this abstraction, an - * edit control was part of the 'data' of the dialog and its 'value' - * was the edit control's text. For a check box the 'value' is + * edit control was part of the 'data' of the dialog and its 'data' + * was the edit control's text. For a check box the 'data' is * checked or not, etc.. * */ -RexxMethod1(RexxObjectPtr, dlgctrl_value, CSELF, pCSelf) +RexxMethod1(RexxObjectPtr, dlgctrl_data, CSELF, pCSelf) { pCDialogControl pcdc = (pCDialogControl)pCSelf; return getControlData(context, dlgToCSelf(context, pcdc->oDlg), pcdc->id, pcdc->hDlg, pcdc->controlType); } -/** DialogControl::"value=" +/** DialogControl::"data=" * - * Sets the "value" of the dialog control. + * Sets the "data" of the dialog control. * - * @param data What to set the value of the dialog control to. Its meaning + * @param data What to set the 'data' of the dialog control to. Its meaning * and format are dependent on the type of control. * - * @return 0 on success, 1 on error. + * @return No return for "=" methods. * - * @remarks See the remarks in dlgctrl_value above. + * @remarks See the remarks in dlgctrl_data above. */ -RexxMethod2(int32_t, dlgctrl_valueEquals, CSTRING, data, CSELF, pCSelf) +RexxMethod2(RexxObjectPtr, dlgctrl_dataEquals, CSTRING, data, CSELF, pCSelf) { pCDialogControl pcdc = (pCDialogControl)pCSelf; - return setControlData(context, dlgToCSelf(context, pcdc->oDlg), pcdc->id, data, pcdc->hDlg, pcdc->controlType); + setControlData(context, dlgToCSelf(context, pcdc->oDlg), pcdc->id, data, pcdc->hDlg, pcdc->controlType); + return NULLOBJECT; } Modified: main/trunk/extensions/platform/windows/oodialog/oodPackageEntry.cpp =================================================================== --- main/trunk/extensions/platform/windows/oodialog/oodPackageEntry.cpp 2010-03-12 01:51:57 UTC (rev 5689) +++ main/trunk/extensions/platform/windows/oodialog/oodPackageEntry.cpp 2010-03-12 01:55:17 UTC (rev 5690) @@ -431,8 +431,8 @@ REXX_METHOD_PROTOTYPE(dlgctrl_getTextSizeDlg); REXX_METHOD_PROTOTYPE(dlgctrl_captureMouse); REXX_METHOD_PROTOTYPE(dlgctrl_setColor); -REXX_METHOD_PROTOTYPE(dlgctrl_value); -REXX_METHOD_PROTOTYPE(dlgctrl_valueEquals); +REXX_METHOD_PROTOTYPE(dlgctrl_data); +REXX_METHOD_PROTOTYPE(dlgctrl_dataEquals); // Static REXX_METHOD_PROTOTYPE(stc_getIcon); @@ -969,8 +969,8 @@ REXX_METHOD(dlgctrl_getTextSizeDlg, dlgctrl_getTextSizeDlg), REXX_METHOD(dlgctrl_captureMouse, dlgctrl_captureMouse), REXX_METHOD(dlgctrl_setColor, dlgctrl_setColor), - REXX_METHOD(dlgctrl_value, dlgctrl_value), - REXX_METHOD(dlgctrl_valueEquals, dlgctrl_valueEquals), + REXX_METHOD(dlgctrl_data, dlgctrl_data), + REXX_METHOD(dlgctrl_dataEquals, dlgctrl_dataEquals), REXX_METHOD(window_init, window_init), REXX_METHOD(window_unInit, window_unInit), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |