From: <mie...@us...> - 2011-04-22 15:47:41
|
Revision: 6933 http://oorexx.svn.sourceforge.net/oorexx/?rev=6933&view=rev Author: miesfeld Date: 2011-04-22 15:47:35 +0000 (Fri, 22 Apr 2011) Log Message: ----------- ooDialog - fix bug(s) when setting month calendar day states Modified Paths: -------------- main/trunk/extensions/platform/windows/oodialog/oodUtilities.cpp main/trunk/extensions/platform/windows/oodialog/oodViewControls.cpp Modified: main/trunk/extensions/platform/windows/oodialog/oodUtilities.cpp =================================================================== --- main/trunk/extensions/platform/windows/oodialog/oodUtilities.cpp 2011-04-22 01:19:10 UTC (rev 6932) +++ main/trunk/extensions/platform/windows/oodialog/oodUtilities.cpp 2011-04-22 15:47:35 UTC (rev 6933) @@ -1361,7 +1361,8 @@ RexxObjectPtr rxMDSVal; PDAYSTATE pDayState; - for ( size_t i = 1; i <= count; i++, pmds++ ) + MONTHDAYSTATE *p = pmds; + for ( size_t i = 1; i <= count; i++, p++ ) { rxMDSVal = c->ArrayAt(list, i); if ( rxMDSVal == NULLOBJECT || ! c->IsOfType(rxMDSVal, "DAYSTATE") ) @@ -1372,7 +1373,7 @@ } pDayState = (PDAYSTATE)c->ObjectToCSelf(rxMDSVal); - *pmds = pDayState->val; + *p = pDayState->val; } if ( mdsBuf != NULLOBJECT && ppmds != NULL ) Modified: main/trunk/extensions/platform/windows/oodialog/oodViewControls.cpp =================================================================== --- main/trunk/extensions/platform/windows/oodialog/oodViewControls.cpp 2011-04-22 01:19:10 UTC (rev 6932) +++ main/trunk/extensions/platform/windows/oodialog/oodViewControls.cpp 2011-04-22 15:47:35 UTC (rev 6933) @@ -905,7 +905,7 @@ inline RexxObjectPtr setDayState(HWND hMC, LPMONTHDAYSTATE pmds, int count, RexxObjectPtr result) { - if ( result != TheFalseObj ) + if ( result != NULLOBJECT ) { result = (MonthCal_SetDayState(hMC, count, pmds) == 0 ? TheFalseObj : TheTrueObj); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |