Commits

Anonymous committed dd6422f Merge

cws avmedia102: rebase m83

Comments (0)

Files changed (1437)

 4c02d2669043bd6f16d57ecbd21061d15745a613 DEV300_m79
 9f08556668b1565f293d735949e3b16d96e78651 DEV300_m80
 d3a11d2d353c2bf49d279018f2a59774484e9b38 DEV300_m81
+a5fb3c4091cbac8324a98bf080c08ef626b32258 DEV300_m82
+23debe0bf2cd63dd34c412ccb0de5e4dcfe62e58 DEV300_m83

automation/source/server/statemnt.cxx

 							{			// Wir fälschen einen Parameter
                                 if ( aUId.HasNumeric() )
                                 {
-								    nParams = PARAM_ULONG_1;
+								    nParams |= PARAM_ULONG_1;
 								    nLNr1 = USHORT( aUId.GetNum() );
 								    DBG_ASSERT( nLNr1 <= 0xFFFF, "ID on ToolBox > 0xFFFF" );
                                 }
                                 else
                                 {
-								    nParams = PARAM_STR_1;
+								    nParams |= PARAM_STR_1;
                                     aString1 = aUId.GetStr();
                                 }
 							}
     BOOL bItemFound = FALSE;\
 	{\
 		SmartId aButtonId;\
-		if( nParams == PARAM_STR_1 )\
+		if( nParams & PARAM_STR_1 )\
 			aButtonId = SmartId( aString1 );\
-		if( nParams == PARAM_ULONG_1 )\
+		if( nParams & PARAM_ULONG_1 )\
 			aButtonId = SmartId( nLNr1 );\
 		for ( nItemPos = 0; nItemPos < pTB->GetItemCount() && !aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos))) &&\
 		                                              !aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos))) ; nItemPos++ ) {}\
 			ReportError( aUId, GEN_RES_STR1( S_HELPID_ON_TOOLBOX_NOT_FOUND, MethodString( nMethodId ) ) );\
 		else\
 		{\
-			if ( !pTB->IsItemEnabled( pTB->GetItemId(nItemPos) ) && nMethodId != _M_IsEnabled )\
+			if ( !pTB->IsItemEnabled( pTB->GetItemId(nItemPos) ) && nMethodId != _M_IsEnabled && nMethodId != M_GetState )\
 			{\
 				ReportError( aUId, GEN_RES_STR1( S_BUTTON_DISABLED_ON_TOOLBOX, MethodString( nMethodId ) ) );\
 				bItemFound = FALSE;\
 			}\
-			else if ( !pTB->IsItemVisible( pTB->GetItemId(nItemPos) ) )\
+			else if ( !pTB->IsItemVisible( pTB->GetItemId(nItemPos) ) && nMethodId != M_GetState )\